mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: fix default server interface option

Browse Source
This commit is contained in:
Marc-André Moreau 2013-04-29 19:53:56 -04:00
parent 97b0aebeef
commit d1e4798372
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -76,15 +76,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Default to release build type # Default to release build type
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release") 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() endif()
if(NOT DEFINED BUILD_SHARED_LIBS) if(NOT DEFINED BUILD_SHARED_LIBS)
@ -245,6 +237,7 @@ if(ANDROID)
endif() endif()
set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
if(NOT IOS AND NOT ANDROID) if(NOT IOS AND NOT ANDROID)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
endif() endif()
@ -443,9 +436,10 @@ if(WITH_CHANNELS)
endif() endif()
if (IOS) if (IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET "") set(CMAKE_OSX_DEPLOYMENT_TARGET "")
set(CMAKE_OSX_SYSROOT "iphoneos") set(CMAKE_OSX_SYSROOT "iphoneos")
endif() endif()
if(WITH_CLIENT) if(WITH_CLIENT)
add_subdirectory(client) add_subdirectory(client)
endif() endif()
@ -477,7 +471,6 @@ if(NOT WIN32)
endif() endif()
endif() endif()
endif() endif()
set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
@ -556,10 +549,9 @@ set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "Development")
# problems when compiling freerdp/jni. To prevent this problem # problems when compiling freerdp/jni. To prevent this problem
# we set the macros to "". # we set the macros to "".
if (ANDROID AND CMAKE_EXTRA_GENERATOR STREQUAL "Eclipse CDT4") if (ANDROID AND CMAKE_EXTRA_GENERATOR STREQUAL "Eclipse CDT4")
set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "") set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "")
message(STATUS "Disabled CXX system defines for eclipse (workaround).") message(STATUS "Disabled CXX system defines for eclipse (workaround).")
endif() endif()
include(CPack) include(CPack)

3
cmake/ConfigOptions.cmake
View File

@ -76,7 +76,8 @@ endif()
option(WITH_THIRD_PARTY "Build third-party components" OFF) option(WITH_THIRD_PARTY "Build third-party components" OFF)
option(WITH_SERVER_INTERFACE "Build server as a library with an interface" OFF) option(WITH_CLIENT_INTERFACE "Build clients as a library with an interface" ON)
option(WITH_SERVER_INTERFACE "Build servers as a library with an interface" ON)
option(WITH_DEBUG_ALL "Print all debug messages." OFF) option(WITH_DEBUG_ALL "Print all debug messages." OFF)