From 03a401b8e6d19c7b54edb585815862286040c8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20LeBlanc?= Date: Thu, 25 Jul 2013 21:59:21 -0400 Subject: [PATCH] CMakelists: disabled installation of headers and libraries for the wayk client. --- CMakeLists.txt | 12 ++++++++++-- client/CMakeLists.txt | 2 +- client/Windows/CMakeLists.txt | 2 ++ client/common/CMakeLists.txt | 4 +++- libfreerdp/CMakeLists.txt | 8 +++++--- winpr/CMakeLists.txt | 4 +++- winpr/libwinpr/CMakeLists.txt | 3 +++ winpr/tools/makecert/CMakeLists.txt | 6 ++++-- 8 files changed, 31 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eb9b877f..44f369db9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,7 @@ endif() if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Gd") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MT") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MD") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ob2") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W2") @@ -462,7 +462,9 @@ if(WITH_THIRD_PARTY) endif() endif() -add_subdirectory(include) +if (NOT WITH_WAYK) + add_subdirectory(include) +endif() add_subdirectory(libfreerdp) @@ -487,6 +489,8 @@ endif() SET(CPACK_BINARY_ZIP "ON") +if(NOT WITH_WAYK) + set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;/\\\\.gitignore;/CMakeCache.txt") if(NOT WIN32) @@ -542,9 +546,12 @@ if(MSVC) if(MSVC_RUNTIME STREQUAL "dynamic") set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) include(InstallRequiredSystemLibraries) + +if(NOT WITH_WAYK) install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries) +endif() endif() set(EXTRA_DATA_DIR "extra/") @@ -590,3 +597,4 @@ endif() include(CPack) +endif() diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 2543bb028..e78c37517 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -57,4 +57,4 @@ endif() if (WITH_DOTNET) add_subdirectory(DotNetClient) -endif() \ No newline at end of file +endif() diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt index 0f2b26d65..f32422cd3 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt @@ -63,8 +63,10 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) if(WITH_CLIENT_INTERFACE) + if (NOT WITH_WAYK) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) add_subdirectory(cli) + endif() else() install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client) endif() diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt index e249cd0db..954f3a46f 100644 --- a/client/common/CMakeLists.txt +++ b/client/common/CMakeLists.txt @@ -53,7 +53,9 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) set_target_properties(${MODULE_NAME} PROPERTIES LINK_INTERFACE_LIBRARIES "") -install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) +if (NOT WITH_WAYK) + install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) +endif() set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common") diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index 6dccb0771..bbc714b15 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -59,9 +59,11 @@ if(MONOLITHIC_BUILD) target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - install(TARGETS ${MODULE_NAME} - DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT libraries) + if(NOT WITH_WAYK) + install(TARGETS ${MODULE_NAME} + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT libraries) + endif() set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp") endif() diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 226291f57..9e265095e 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -69,7 +69,9 @@ endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h) -add_subdirectory(include) +if(NOT WITH_WAYK) + add_subdirectory(include) +endif() add_subdirectory(libwinpr) diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt index fdb2bdac5..c5c2c6ece 100644 --- a/winpr/libwinpr/CMakeLists.txt +++ b/winpr/libwinpr/CMakeLists.txt @@ -54,7 +54,10 @@ if(MONOLITHIC_BUILD) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib") 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 7663caa18..c31d08cef 100644 --- a/winpr/tools/makecert/CMakeLists.txt +++ b/winpr/tools/makecert/CMakeLists.txt @@ -38,8 +38,10 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) -add_subdirectory(cli) +if(NOT WITH_WAYK) + install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) + add_subdirectory(cli) +endif() set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")