diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-01 16:41:00 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-01 16:41:00 (GMT) |
commit | 782bef73746cce51a000effd72f16b2fbb3d3d8a (patch) | |
tree | a529545cc540245b811534b506c762d4e18b15fe /Source/cmBuildCommand.cxx | |
parent | e95224b2e747c8eacba178c37a9ad5c5c055cbf4 (diff) | |
download | CMake-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/cmBuildCommand.cxx')
-rw-r--r-- | Source/cmBuildCommand.cxx | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx index 6c7d7bd..382ba6b 100644 --- a/Source/cmBuildCommand.cxx +++ b/Source/cmBuildCommand.cxx @@ -33,40 +33,9 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) std::string makeprogram = args[1]; std::string makecommand = m_Makefile->GetLocalGenerator()->GetGlobalGenerator()->GenerateBuildCommand( - makeprogram.c_str(), m_Makefile->GetProjectName(), 0, "Release", true); -#if 0 - std::string makecommand; - if(makeprogram.find("msdev") != std::string::npos || - makeprogram.find("MSDEV") != std::string::npos ) - { - makecommand = "\""; - makecommand += makeprogram; - makecommand += "\""; - makecommand += " "; - makecommand += m_Makefile->GetProjectName(); - makecommand += ".dsw /MAKE \"ALL_BUILD - Release\" "; - } - else if (makeprogram.find("devenv") != std::string::npos || - makeprogram.find("DEVENV") != std::string::npos ) - { - makecommand = "\""; - makecommand += makeprogram; - makecommand += "\""; - makecommand += " "; - makecommand += m_Makefile->GetProjectName(); - makecommand += ".sln /build Release /project ALL_BUILD"; - } - else if (makeprogram.find("xcodebuild") != std::string::npos) - { - makecommand += makeprogram; - } - else - { - makecommand = makeprogram; - makecommand += " -i"; - } - std::cerr << "-- Compare: " << makecommand.c_str() << " and " << makecmd.c_str() << ": " << (makecmd == makecommand) << std::endl; -#endif + makeprogram.c_str(), m_Makefile->GetProjectName(), 0, + 0, "Release", true); + if(cacheValue) { return true; |