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

server-mode: Add option to enable/disable test case explicitly 

Add a `CMake_TEST_SERVER_MODE` option that can be set in testing builds
to enable/disable server mode tests explicitly.  This will allow testing
in combination with `CMake_TEST_EXTERNAL_CMAKE` or for server mode to be
built on systems that have a python version that cannot run the test.
This commit is contained in:
Brad King 2016-09-29 13:40:21 -04:00
parent 6b97a5efc6
commit 523f8ec82c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -715,6 +715,9 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
else() else()
set(CMake_ENABLE_SERVER_MODE 0) set(CMake_ENABLE_SERVER_MODE 0)
endif() endif()
if(NOT DEFINED CMake_TEST_SERVER_MODE)
set(CMake_TEST_SERVER_MODE ${CMake_ENABLE_SERVER_MODE})
endif()
if(NOT CMake_TEST_EXTERNAL_CMAKE) if(NOT CMake_TEST_EXTERNAL_CMAKE)
if(NOT CMake_VERSION_IS_RELEASE) if(NOT CMake_VERSION_IS_RELEASE)

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_ENABLE_SERVER_MODE) if(CMake_TEST_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)