summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestBuildCommand.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-12-01 16:41:00 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-12-01 16:41:00 (GMT)
commit782bef73746cce51a000effd72f16b2fbb3d3d8a (patch)
treea529545cc540245b811534b506c762d4e18b15fe /Source/CTest/cmCTestBuildCommand.cxx
parente95224b2e747c8eacba178c37a9ad5c5c055cbf4 (diff)
downloadCMake-782bef73746cce51a000effd72f16b2fbb3d3d8a.zip
CMake-782bef73746cce51a000effd72f16b2fbb3d3d8a.tar.gz
CMake-782bef73746cce51a000effd72f16b2fbb3d3d8a.tar.bz2
ENH: Add a way for the generated command to include extra flags. This is useful for CTest (or try compile) to add -j2
Diffstat (limited to 'Source/CTest/cmCTestBuildCommand.cxx')
-rw-r--r--Source/CTest/cmCTestBuildCommand.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index fcfdf2f..e5d20ed 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -108,6 +108,7 @@ bool cmCTestBuildCommand::InitialPass(
const char* cmakeGeneratorName = m_Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
const char* cmakeProjectName = m_Makefile->GetDefinition("CTEST_PROJECT_NAME");
const char* cmakeBuildConfiguration = m_Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
+ const char* cmakeBuildAdditionalFlags = m_Makefile->GetDefinition("CTEST_BUILD_FLAGS");
if ( cmakeGeneratorName && *cmakeGeneratorName &&
cmakeProjectName && *cmakeProjectName )
{
@@ -132,7 +133,7 @@ bool cmCTestBuildCommand::InitialPass(
const char* cmakeMakeProgram = m_Makefile->GetDefinition("CMAKE_MAKE_PROGRAM");
std::string buildCommand
= m_GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, cmakeProjectName,
- 0, cmakeBuildConfiguration, true);
+ cmakeBuildAdditionalFlags, 0, cmakeBuildConfiguration, true);
m_CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str());
}
else