diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-29 17:18:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-29 17:20:10 (GMT) |
| commit | a8334961997767ecc31333b52537aa5e5b6c561c (patch) | |
| tree | 4b63eb0ce11abef1b78f1cd9498009364f2e57cb | |
| parent | 97b6e17c336f36556981e9371af78f08f4d304bb (diff) | |
| download | CMake-a8334961997767ecc31333b52537aa5e5b6c561c.zip CMake-a8334961997767ecc31333b52537aa5e5b6c561c.tar.gz CMake-a8334961997767ecc31333b52537aa5e5b6c561c.tar.bz2 | |
server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODE
The latter is a better name for making it a public-facing option.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce3af2..6a26858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -695,13 +695,13 @@ endif() CMAKE_SETUP_TESTING() # 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) 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) if(CMake_HAVE_CXX_AUTO_TYPE AND CMake_HAVE_CXX_RANGE_FOR) if(CMake_HAVE_CXX_MAKE_UNIQUE) - set(CMake_HAVE_SERVER_MODE 1) + set(CMake_ENABLE_SERVER_MODE 1) endif() endif() endif() diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b8f02e3..2641381 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -778,7 +778,7 @@ add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h ${MANIFEST_FILE}) list(APPEND _tools cmake) target_link_libraries(cmake CMakeLib) -if(CMake_HAVE_SERVER_MODE) +if(CMake_ENABLE_SERVER_MODE) add_library(CMakeServerLib cmServer.cxx cmServer.h cmServerConnection.cxx cmServerConnection.h diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c056fb8..484ea8a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -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_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. find_package(PythonInterp QUIET) if(PYTHON_EXECUTABLE) |