diff options
Diffstat (limited to 'Source/CTest/cmCTestBuildCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index e5d20ed..361bf66 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -9,8 +9,8 @@ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ @@ -63,16 +63,18 @@ bool cmCTestBuildCommand::InitialPass( { if ( res_var ) { - this->SetError("called with incorrect number of arguments. RETURN_VALUE specified twice."); + this->SetError("called with incorrect number of arguments. " + "RETURN_VALUE specified twice."); return false; } havereturn_variable = true; - } + } else if(args[i] == "BUILD") { if ( build_dir ) { - this->SetError("called with incorrect number of arguments. BUILD specified twice."); + this->SetError("called with incorrect number of arguments. " + "BUILD specified twice."); return false; } havesource = true; @@ -80,7 +82,8 @@ bool cmCTestBuildCommand::InitialPass( else { cmOStringStream str; - str << "called with incorrect number of arguments. Extra argument is: " << args[i].c_str() << "."; + str << "called with incorrect number of arguments. Extra argument is: " + << args[i].c_str() << "."; this->SetError(str.str().c_str()); return false; } @@ -97,18 +100,23 @@ bool cmCTestBuildCommand::InitialPass( this->SetError("internal CTest error. Cannot instantiate build handler"); return false; } - - const char* ctestBuildCommand = m_Makefile->GetDefinition("CTEST_BUILD_COMMAND"); + + const char* ctestBuildCommand + = m_Makefile->GetDefinition("CTEST_BUILD_COMMAND"); if ( ctestBuildCommand && *ctestBuildCommand ) { m_CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand); } else { - 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"); + 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 ) { @@ -126,25 +134,31 @@ bool cmCTestBuildCommand::InitialPass( } if ( !m_GlobalGenerator ) { - m_GlobalGenerator = - m_Makefile->GetCMakeInstance()->CreateGlobalGenerator(cmakeGeneratorName); + m_GlobalGenerator = + m_Makefile->GetCMakeInstance()->CreateGlobalGenerator( + cmakeGeneratorName); } m_GlobalGenerator->FindMakeProgram(m_Makefile); - const char* cmakeMakeProgram = m_Makefile->GetDefinition("CMAKE_MAKE_PROGRAM"); + const char* cmakeMakeProgram + = m_Makefile->GetDefinition("CMAKE_MAKE_PROGRAM"); std::string buildCommand - = m_GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, cmakeProjectName, + = m_GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram, + cmakeProjectName, cmakeBuildAdditionalFlags, 0, cmakeBuildConfiguration, true); m_CTest->SetCTestConfiguration("MakeCommand", buildCommand.c_str()); } else { cmOStringStream ostr; - ostr << "CTEST_BUILD_COMMAND or CTEST_CMAKE_GENERATOR not specified. Please specify the CTEST_CMAKE_GENERATOR and CTEST_PROJECT_NAME if this is a CMake project, or specify the CTEST_BUILD_COMMAND for cmake or any other project."; + ostr << "CTEST_BUILD_COMMAND or CTEST_CMAKE_GENERATOR not specified. " + "Please specify the CTEST_CMAKE_GENERATOR and CTEST_PROJECT_NAME if " + "this is a CMake project, or specify the CTEST_BUILD_COMMAND for " + "cmake or any other project."; this->SetError(ostr.str().c_str()); return false; } } - + int res = handler->ProcessHandler(); if ( res_var ) { |