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

Added TARGET, CONFIGURATION, PROJECT_NAME, and FLAGS arguments to ctest_build command

This commit is contained in:
Zach Mullen 2009-11-03 16:46:30 -05:00
parent b9e88cd4c8
commit 85912a3777
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/CTest/cmCTestBuildCommand.cxx
View File

@ -24,6 +24,10 @@ cmCTestBuildCommand::cmCTestBuildCommand()
this->GlobalGenerator = 0; this->GlobalGenerator = 0;
this->Arguments[ctb_NUMBER_ERRORS] = "NUMBER_ERRORS"; this->Arguments[ctb_NUMBER_ERRORS] = "NUMBER_ERRORS";
this->Arguments[ctb_NUMBER_WARNINGS] = "NUMBER_WARNINGS"; this->Arguments[ctb_NUMBER_WARNINGS] = "NUMBER_WARNINGS";
this->Arguments[ctb_TARGET] = "TARGET";
this->Arguments[ctb_CONFIGURATION] = "CONFIGURATION";
this->Arguments[ctb_FLAGS] = "FLAGS";
this->Arguments[ctb_PROJECT_NAME] = "PROJECT_NAME";
this->Arguments[ctb_LAST] = 0; this->Arguments[ctb_LAST] = 0;
this->Last = ctb_LAST; this->Last = ctb_LAST;
} }
@ -60,13 +64,22 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler()
const char* cmakeGeneratorName const char* cmakeGeneratorName
= this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR"); = this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
const char* cmakeProjectName const char* cmakeProjectName
= this->Makefile->GetDefinition("CTEST_PROJECT_NAME"); = (this->Values[ctb_PROJECT_NAME] && *this->Values[ctb_PROJECT_NAME])
? this->Values[ctb_PROJECT_NAME]
: this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
const char* cmakeBuildConfiguration const char* cmakeBuildConfiguration
= this->Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION"); = (this->Values[ctb_CONFIGURATION] && *this->Values[ctb_CONFIGURATION])
? this->Values[ctb_CONFIGURATION]
: this->Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
const char* cmakeBuildAdditionalFlags const char* cmakeBuildAdditionalFlags
= this->Makefile->GetDefinition("CTEST_BUILD_FLAGS"); = (this->Values[ctb_FLAGS] && *this->Values[ctb_FLAGS])
? this->Values[ctb_FLAGS]
: this->Makefile->GetDefinition("CTEST_BUILD_FLAGS");
const char* cmakeBuildTarget const char* cmakeBuildTarget
= this->Makefile->GetDefinition("CTEST_BUILD_TARGET"); = (this->Values[ctb_TARGET] && *this->Values[ctb_TARGET])
? this->Values[ctb_TARGET]
: this->Makefile->GetDefinition("CTEST_BUILD_TARGET");
if ( cmakeGeneratorName && *cmakeGeneratorName && if ( cmakeGeneratorName && *cmakeGeneratorName &&
cmakeProjectName && *cmakeProjectName ) cmakeProjectName && *cmakeProjectName )
{ {

4
Source/CTest/cmCTestBuildCommand.h
View File

@ -82,6 +82,10 @@ protected:
ctb_BUILD = ct_LAST, ctb_BUILD = ct_LAST,
ctb_NUMBER_ERRORS, ctb_NUMBER_ERRORS,
ctb_NUMBER_WARNINGS, ctb_NUMBER_WARNINGS,
ctb_TARGET,
ctb_CONFIGURATION,
ctb_FLAGS,
ctb_PROJECT_NAME,
ctb_LAST ctb_LAST
}; };