diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-05 21:10:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-07 16:09:56 (GMT) |
| commit | 56ca8d4e6365d67901e0cff7f2bd99f174537a97 (patch) | |
| tree | 17473ad1dd7b67c915b53a17b0bca243b500cc45 /Tests/CTestConfig | |
| parent | f36c665df80e8e3f4eca0fed28b5d1c3df739552 (diff) | |
| download | CMake-56ca8d4e6365d67901e0cff7f2bd99f174537a97.zip CMake-56ca8d4e6365d67901e0cff7f2bd99f174537a97.tar.gz CMake-56ca8d4e6365d67901e0cff7f2bd99f174537a97.tar.bz2 | |
Tests: Add generator toolset support
Propagate CMAKE_GENERATOR_TOOLSET through the test hierarchy so that all
tests can build with the selected generator toolset, if any.
Diffstat (limited to 'Tests/CTestConfig')
| -rw-r--r-- | Tests/CTestConfig/dashboard.cmake.in | 5 | ||||
| -rw-r--r-- | Tests/CTestConfig/script.cmake.in | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Tests/CTestConfig/dashboard.cmake.in b/Tests/CTestConfig/dashboard.cmake.in index c7ac210..0bba6d6 100644 --- a/Tests/CTestConfig/dashboard.cmake.in +++ b/Tests/CTestConfig/dashboard.cmake.in @@ -17,7 +17,10 @@ endif() message("cmake initial configure") execute_process(COMMAND ${CMAKE_COMMAND} - ${arg} -G "@CMAKE_TEST_GENERATOR@" ${CTEST_SOURCE_DIRECTORY} + ${arg} + -G "@CMAKE_TEST_GENERATOR@" + -T "@CMAKE_TEST_GENERATOR_TOOLSET@" + ${CTEST_SOURCE_DIRECTORY} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} RESULT_VARIABLE rv) if(NOT rv STREQUAL 0) diff --git a/Tests/CTestConfig/script.cmake.in b/Tests/CTestConfig/script.cmake.in index 5ceb7c3..83267a4 100644 --- a/Tests/CTestConfig/script.cmake.in +++ b/Tests/CTestConfig/script.cmake.in @@ -1,4 +1,5 @@ set(CTEST_CMAKE_GENERATOR "@CMAKE_TEST_GENERATOR@") +set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_TEST_GENERATOR_TOOLSET@") set(CTEST_PROJECT_NAME "CTestConfig") set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestConfig") set(CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestConfig/@cfg@-script") |