diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-15 14:27:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-09-15 14:27:38 (GMT) |
| commit | b234836637d97b2d9cc837829c485ec87e64c5ce (patch) | |
| tree | 294c854c5146ac45b5598f7220c36a4a4c7b8b6e /Modules | |
| parent | 9edf6903e62f84a567db3938bb8fec3f19789545 (diff) | |
| parent | be6a555d7ec9348575e3431bd6709f48dc959100 (diff) | |
| download | CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.zip CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.tar.gz CMake-b234836637d97b2d9cc837829c485ec87e64c5ce.tar.bz2 | |
Merge topic 'vs-generator-platform'
be6a555d Tests: Test setting a generator platform in a toolchain file
d506fee8 Tests: Use -A option to pass generator platform selection
11c9ddd6 ExternalProject: Use -A option to pass generator platform
29bd843e CTest: Use -A option to pass generator platform selection
eb7d8156 cmake: Add -A option to specify a generator platform
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 27026f3..f8c996e 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1764,7 +1764,7 @@ function(_ep_add_configure_command name) if(cmake_generator) list(APPEND cmd "-G${cmake_generator}") if(cmake_generator_platform) - list(APPEND cmd "-DCMAKE_GENERATOR_PLATFORM=${cmake_generator_platform}") + list(APPEND cmd "-A${cmake_generator_platform}") endif() if(cmake_generator_toolset) list(APPEND cmd "-T${cmake_generator_toolset}") @@ -1779,7 +1779,7 @@ function(_ep_add_configure_command name) message(FATAL_ERROR "Option CMAKE_GENERATOR_PLATFORM not allowed without CMAKE_GENERATOR.") endif() if(CMAKE_GENERATOR_PLATFORM) - list(APPEND cmd "-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}") + list(APPEND cmd "-A${CMAKE_GENERATOR_PLATFORM}") endif() if(cmake_generator_toolset) message(FATAL_ERROR "Option CMAKE_GENERATOR_TOOLSET not allowed without CMAKE_GENERATOR.") |