From 37bb2bda8e1ec908c2786c9a7137d1e0a1c5e21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 18 Mar 2013 22:29:52 -0400 Subject: [PATCH] cmake: build client/server interfaces by default --- CMakeLists.txt | 8 ++++++++ channels/server/CMakeLists.txt | 2 ++ 2 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63f5d1c46..a7ddf8396 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,14 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif() +if(NOT DEFINED WITH_CLIENT_INTERFACE) + set(WITH_CLIENT_INTERFACE ON) +endif() + +if(NOT DEFINED WITH_SERVER_INTERFACE) + set(WITH_SERVER_INTERFACE ON) +endif() + if(NOT DEFINED BUILD_SHARED_LIBS) if(ANDROID OR IOS) set(BUILD_SHARED_LIBS OFF) diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt index fbe33d668..b86cd6df4 100644 --- a/channels/server/CMakeLists.txt +++ b/channels/server/CMakeLists.txt @@ -44,3 +44,5 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} PARENT_SCOPE) set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} PARENT_SCOPE) + +set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Server/Common")