kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: for build and test default the config type to the one that ctest was built with, it is good for the current ctest setup, and other projects can always specify a value on the command line

This commit is contained in:
Bill Hoffman 2007-09-11 14:43:17 -04:00
parent 66a094a9eb
commit 1f99030cfa
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/CTest/cmCTestBuildAndTestHandler.cxx
View File

@ -72,10 +72,20 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
generator += this->BuildGenerator; generator += this->BuildGenerator;
args.push_back(generator); args.push_back(generator);
} }
const char* config = 0;
if ( this->CTest->GetConfigType().size() > 0 ) if ( this->CTest->GetConfigType().size() > 0 )
{
config = this->CTest->GetConfigType().c_str();
}
#ifdef CMAKE_INTDIR
config = CMAKE_INTDIR;
#endif
if ( config )
{ {
std::string btype std::string btype
= "-DCMAKE_BUILD_TYPE:STRING=" + this->CTest->GetConfigType(); = "-DCMAKE_BUILD_TYPE:STRING=" + std::string(config);
args.push_back(btype); args.push_back(btype);
} }
@ -235,11 +245,23 @@ int cmCTestBuildAndTestHandler::RunCMakeAndTest(std::string* outstring)
} }
} }
std::string output; std::string output;
const char* config = 0;
if ( this->CTest->GetConfigType().size() > 0 )
{
config = this->CTest->GetConfigType().c_str();
}
#ifdef CMAKE_INTDIR
config = CMAKE_INTDIR;
#endif
if(!config)
{
config = "Debug";
}
int retVal = cm.GetGlobalGenerator()->Build( int retVal = cm.GetGlobalGenerator()->Build(
this->SourceDir.c_str(), this->BinaryDir.c_str(), this->SourceDir.c_str(), this->BinaryDir.c_str(),
this->BuildProject.c_str(), tarIt->c_str(), this->BuildProject.c_str(), tarIt->c_str(),
&output, this->BuildMakeProgram.c_str(), &output, this->BuildMakeProgram.c_str(),
this->CTest->GetConfigType().c_str(), config,
!this->BuildNoClean, !this->BuildNoClean,
false, remainingTime); false, remainingTime);