From a8334961997767ecc31333b52537aa5e5b6c561c Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 29 Sep 2016 13:18:47 -0400 Subject: [PATCH] server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODE The latter is a better name for making it a public-facing option. --- CMakeLists.txt | 4 ++-- Source/CMakeLists.txt | 2 +- Tests/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce3af297..6a26858fc 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 b8f02e38d..264138171 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 c056fb878..484ea8a59 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)