diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-27 08:02:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-27 08:02:24 (GMT) |
| commit | e710d6953dae27f73452095df6d7b2d7ec698fd1 (patch) | |
| tree | 2f5b4c46d89fadcb3560436cf9aa743582d1f09c /Tests | |
| parent | 19f2a706a3d0ca72f0c6151bbfcd3b944c14e72b (diff) | |
| parent | 27d87fbd04839e868ae7ef3c27ddfcb9379e80a0 (diff) | |
| download | CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.zip CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.tar.gz CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.tar.bz2 | |
Merge topic 'server-cxx11'
27d87fbd CTestCustom: Suppress exception loosening warning
7f29bbe6 server: always enable server
4614a3b2 server: backport to C++11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1149
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 13d796e..f0e58ee 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2818,13 +2818,11 @@ ${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_TEST_SERVER_MODE) - # The cmake server-mode test requires python for a simple client. - find_package(PythonInterp QUIET) - if(PYTHON_EXECUTABLE) - set(Server_BUILD_OPTIONS -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}) - ADD_TEST_MACRO(Server Server) - endif() + # The cmake server-mode test requires python for a simple client. + find_package(PythonInterp QUIET) + if(PYTHON_EXECUTABLE) + set(Server_BUILD_OPTIONS -DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}) + ADD_TEST_MACRO(Server Server) endif() configure_file( |