diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-17 14:40:57 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-17 14:40:57 (GMT) |
commit | 267fd538d837d40e7ed865326899e0105265a515 (patch) | |
tree | 05c3dd5fe631f0cd4e51038feea95a35d46eeddd /Source/CTest/cmCTestBuildCommand.cxx | |
parent | 5c48eab7a8d18c787111a387359716d59b70598a (diff) | |
download | CMake-267fd538d837d40e7ed865326899e0105265a515.zip CMake-267fd538d837d40e7ed865326899e0105265a515.tar.gz CMake-267fd538d837d40e7ed865326899e0105265a515.tar.bz2 |
ENH: fix build issue with config type not being specified by ctest
Diffstat (limited to 'Source/CTest/cmCTestBuildCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index ff284d2..58c3efd 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -92,11 +92,25 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() this->GlobalGenerator->FindMakeProgram(this->Makefile); const char* cmakeMakeProgram = this->Makefile->GetDefinition("CMAKE_MAKE_PROGRAM"); + if(strlen(cmakeBuildConfiguration) == 0) + { + const char* config = 0; +#ifdef CMAKE_INTDIR + config = CMAKE_INTDIR; +#endif + if(!config) + { + config = "Debug"; + } + cmakeBuildConfiguration = config; + } + std::string buildCommand - = this->GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, - cmakeProjectName, - cmakeBuildAdditionalFlags, cmakeBuildTarget, - cmakeBuildConfiguration, true, false); + = this->GlobalGenerator-> + GenerateBuildCommand(cmakeMakeProgram, + cmakeProjectName, + cmakeBuildAdditionalFlags, cmakeBuildTarget, + cmakeBuildConfiguration, true, false); cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "SetMakeCommand:" << buildCommand.c_str() << "\n"); |