diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-14 14:04:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 13:26:22 (GMT) |
| commit | 7fc7624af5403e6bff9dbc99da398be314c0b223 (patch) | |
| tree | aceb80d7232bff12b2c579db8d287f55cea4e701 | |
| parent | 0a7f17b870ceb03fd8687d630ed6fb875dcdc66a (diff) | |
| download | CMake-7fc7624af5403e6bff9dbc99da398be314c0b223.zip CMake-7fc7624af5403e6bff9dbc99da398be314c0b223.tar.gz CMake-7fc7624af5403e6bff9dbc99da398be314c0b223.tar.bz2 | |
Tests: Move CMAKE_TEST_MAKEPROGRAM into Tests/CMakeLists.txt
Also drop the temporary MAKEPROGRAM variable and the DART_ROOT special
case. We never run dashboard clients with Dart anymore.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d6237b3..a13afa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,10 +113,6 @@ endif() # for testing. Simply to improve readability of the main script. #----------------------------------------------------------------------- macro(CMAKE_SETUP_TESTING) - if (NOT DART_ROOT) - set(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM}) - endif () - if(BUILD_TESTING) set(CMAKE_TEST_GENERATOR "" CACHE STRING "Generator used when running tests") @@ -125,7 +121,6 @@ macro(CMAKE_SETUP_TESTING) if(NOT CMAKE_TEST_GENERATOR) set(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}") set(CMAKE_TEST_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}") - set(CMAKE_TEST_MAKEPROGRAM "${MAKEPROGRAM}") else() set(CMAKE_TEST_DIFFERENT_GENERATOR TRUE) set(CMAKE_TEST_GENERATOR_TOOLSET "") diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b6e945e..1b8b2ec 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -43,6 +43,10 @@ configure_file(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in # Testing if(BUILD_TESTING) + if(NOT CMAKE_TEST_DIFFERENT_GENERATOR) + set(CMAKE_TEST_MAKEPROGRAM "${CMAKE_MAKE_PROGRAM}") + endif() + if("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles" OR ("${CMAKE_TEST_GENERATOR}" MATCHES Ninja AND NOT WIN32)) set(TEST_CompileCommandOutput 1) endif() |