diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-12 14:37:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-15 14:26:59 (GMT) |
| commit | 29bd843e8bf8edde3cade3f565c9f5a042d14ca3 (patch) | |
| tree | 981f57954b56f37e3dbe058c2d2850c58c22d0dd /Source/CTest | |
| parent | eb7d8156492c353f9972bdf6e2203657f5d6592e (diff) | |
| download | CMake-29bd843e8bf8edde3cade3f565c9f5a042d14ca3.zip CMake-29bd843e8bf8edde3cade3f565c9f5a042d14ca3.tar.gz CMake-29bd843e8bf8edde3cade3f565c9f5a042d14ca3.tar.bz2 | |
CTest: Use -A option to pass generator platform selection
This is less verbose than defining CMAKE_GENERATOR_PLATFORM.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildAndTestHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestConfigureCommand.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index ece4697..41db042 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -70,7 +70,7 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring, } if(!this->BuildGeneratorPlatform.empty()) { - std::string platform = "-DCMAKE_GENERATOR_PLATFORM="; + std::string platform = "-A"; platform += this->BuildGeneratorPlatform; args.push_back(platform); } diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index 8ab5037..ef62fd3 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -122,7 +122,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler() this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR_PLATFORM"); if(cmakeGeneratorPlatform && *cmakeGeneratorPlatform) { - cmakeConfigureCommand += " \"-DCMAKE_GENERATOR_PLATFORM="; + cmakeConfigureCommand += " \"-A"; cmakeConfigureCommand += cmakeGeneratorPlatform; cmakeConfigureCommand += "\""; } |