diff options
author | Brad King <brad.king@kitware.com> | 2014-09-05 19:40:01 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-09-10 15:21:50 (GMT) |
commit | 09ab207c668deadea3635a20812fa2f478c17f9f (patch) | |
tree | 7c3bdee26a650942d2659573d523752daa1e964a /Tests/CTestConfig | |
parent | 6944997bd6aa69fdf88f8e4e154e68d57195b20b (diff) | |
download | CMake-09ab207c668deadea3635a20812fa2f478c17f9f.zip CMake-09ab207c668deadea3635a20812fa2f478c17f9f.tar.gz CMake-09ab207c668deadea3635a20812fa2f478c17f9f.tar.bz2 |
Tests: Add generator platform support
Propagate CMAKE_GENERATOR_PLATFORM through the test hierarchy so that all
tests can build with the selected generator platform, if any.
Diffstat (limited to 'Tests/CTestConfig')
-rw-r--r-- | Tests/CTestConfig/dashboard.cmake.in | 1 | ||||
-rw-r--r-- | Tests/CTestConfig/script.cmake.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Tests/CTestConfig/dashboard.cmake.in b/Tests/CTestConfig/dashboard.cmake.in index 608501c..cb01744 100644 --- a/Tests/CTestConfig/dashboard.cmake.in +++ b/Tests/CTestConfig/dashboard.cmake.in @@ -19,6 +19,7 @@ message("cmake initial configure") execute_process(COMMAND ${CMAKE_COMMAND} ${arg} -G "@CMAKE_GENERATOR@" + -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -T "@CMAKE_GENERATOR_TOOLSET@" ${CTEST_SOURCE_DIRECTORY} WORKING_DIRECTORY ${CTEST_BINARY_DIRECTORY} diff --git a/Tests/CTestConfig/script.cmake.in b/Tests/CTestConfig/script.cmake.in index 166de3b..b6ccedb 100644 --- a/Tests/CTestConfig/script.cmake.in +++ b/Tests/CTestConfig/script.cmake.in @@ -1,4 +1,5 @@ set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@") +set(CTEST_CMAKE_GENERATOR_PLATFORM "@CMAKE_GENERATOR_PLATFORM@") set(CTEST_CMAKE_GENERATOR_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") set(CTEST_PROJECT_NAME "CTestConfig") set(CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestConfig") |