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.
This commit is contained in:
parent
0a7f17b870
commit
7fc7624af5
|
@ -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 "")
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue