kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODE 

The latter is a better name for making it a public-facing option.
This commit is contained in:
Brad King 2016-09-29 13:18:47 -04:00
parent 97b6e17c33
commit a833496199
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -695,13 +695,13 @@ endif()
CMAKE_SETUP_TESTING() CMAKE_SETUP_TESTING()
# Check whether to build server mode or not: # Check whether to build server mode or not:
set(CMake_HAVE_SERVER_MODE 0) set(CMake_ENABLE_SERVER_MODE 0)
if(NOT CMake_TEST_EXTERNAL_CMAKE AND CMAKE_USE_LIBUV) if(NOT CMake_TEST_EXTERNAL_CMAKE AND CMAKE_USE_LIBUV)
list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_auto_type CMake_HAVE_CXX_AUTO_TYPE)
list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_range_for CMake_HAVE_CXX_RANGE_FOR)
if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR) if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR)
if(CMake_HAVE_CXX_MAKE_UNIQUE) if(CMake_HAVE_CXX_MAKE_UNIQUE)
set(CMake_HAVE_SERVER_MODE 1) set(CMake_ENABLE_SERVER_MODE 1)
endif() endif()
endif() endif()
endif() endif()

2
Source/CMakeLists.txt
View File

@ -778,7 +778,7 @@ add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE})
list(APPEND _tools cmake) list(APPEND _tools cmake)
target_link_libraries(cmake CMakeLib) target_link_libraries(cmake CMakeLib)
if(CMake_HAVE_SERVER_MODE) if(CMake_ENABLE_SERVER_MODE)
add_library(CMakeServerLib add_library(CMakeServerLib
cmServer.cxx cmServer.h cmServer.cxx cmServer.h
cmServerConnection.cxx cmServerConnection.h cmServerConnection.cxx cmServerConnection.h

2
Tests/CMakeLists.txt
View File

@ -2723,7 +2723,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CMakeCommands.target_compile_definitions target_compile_definitions) ADD_TEST_MACRO(CMakeCommands.target_compile_definitions target_compile_definitions)
ADD_TEST_MACRO(CMakeCommands.target_compile_options target_compile_options) ADD_TEST_MACRO(CMakeCommands.target_compile_options target_compile_options)
if(CMake_HAVE_SERVER_MODE) if(CMake_ENABLE_SERVER_MODE)
# The cmake server-mode test requires python for a simple client. # The cmake server-mode test requires python for a simple client.
find_package(PythonInterp QUIET) find_package(PythonInterp QUIET)
if(PYTHON_EXECUTABLE) if(PYTHON_EXECUTABLE)