From 29bd843e8bf8edde3cade3f565c9f5a042d14ca3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 12 Sep 2014 10:37:07 -0400 Subject: [PATCH] CTest: Use -A option to pass generator platform selection This is less verbose than defining CMAKE_GENERATOR_PLATFORM. --- Source/CTest/cmCTestBuildAndTestHandler.cxx | 2 +- 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 ece46973e..41db042a8 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 8ab503702..ef62fd372 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 += "\""; }