From 4a4a36d5c4928d739373e0d481a5192ed3b4f3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Tue, 10 Sep 2013 14:03:15 -0400
Subject: [PATCH] cmake: remove vendor-specific options

---
 CMakeLists.txt                      | 4 ++++
 winpr/CMakeLists.txt                | 4 +---
 winpr/libwinpr/CMakeLists.txt       | 2 --
 winpr/tools/makecert/CMakeLists.txt | 7 +++----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 473c7b58b..ba556d523 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,6 +162,10 @@ if(CMAKE_COMPILER_IS_CLANG)
 	if(WITH_SSE2)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mssse3")
 	endif()
+	CHECK_C_COMPILER_FLAG(-Wno-deprecated-declarations Wno-deprecated-declarations)
+	if(Wno-deprecated-declarations)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
+	endif()
 endif()
 
 if(MSVC)
diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 81904788c..b4aaf45d2 100644
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -72,9 +72,7 @@ endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in 
 	${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h)
 
-if(NOT WITH_WAYK)
-    add_subdirectory(include)
-endif()
+add_subdirectory(include)
 
 add_subdirectory(libwinpr)
 
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index c5c2c6ece..a0d0f612c 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -55,9 +55,7 @@ if(MONOLITHIC_BUILD)
 
 	target_link_libraries(${MODULE_NAME} ${WINPR_LIBS})
 
-if(NOT WITH_WAYK)
 	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
-endif()
 
 	set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")
 endif()
diff --git a/winpr/tools/makecert/CMakeLists.txt b/winpr/tools/makecert/CMakeLists.txt
index c31d08cef..6169d699c 100644
--- a/winpr/tools/makecert/CMakeLists.txt
+++ b/winpr/tools/makecert/CMakeLists.txt
@@ -38,10 +38,9 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-if(NOT WITH_WAYK)
-    install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
-    add_subdirectory(cli)
-endif()
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
+
+add_subdirectory(cli)
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")