diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-10 15:23:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-10 15:23:22 (GMT) |
| commit | 0a92b23c52675bf8fe93cb9959266a49ab509ac1 (patch) | |
| tree | 0f7a40cbf62c8fbbb6b19843a118faa942ce9a51 /Tests/CTestConfig | |
| parent | 2bfe48d6af963472fbd4073f729669306eccac69 (diff) | |
| parent | 09c8ad99433df06ed36791bfaef97996cd2de04e (diff) | |
| download | CMake-0a92b23c52675bf8fe93cb9959266a49ab509ac1.zip CMake-0a92b23c52675bf8fe93cb9959266a49ab509ac1.tar.gz CMake-0a92b23c52675bf8fe93cb9959266a49ab509ac1.tar.bz2 | |
Merge topic 'vs-generator-platform'
09c8ad99 enable_language: Initialize system-specific generator info only once
09ab207c Tests: Add generator platform support
6944997b ExternalProject: Propagate the generator platform
8d332091 CTest: Add options to set generator platform
b97736a2 VS: Implement CMAKE_GENERATOR_PLATFORM for VS >= 8
0f1f1271 CMake: Add CMAKE_GENERATOR_PLATFORM option
4f7d0c42 Help: Document CMAKE_VS_PLATFORM_NAME variable
68d4280a VS: Refactor internal default platform name selection
ad2a4776 cmGlobalVisualStudio10Generator: Re-order some methods
03b7b6cd cmGlobalGenerator: Call SetGeneratorToolset even for empty toolset
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") |