summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-14 16:14:22 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-18 16:30:48 (GMT)
commit91a021146c7a8eb256eca7bb3d9be3acfe3ce814 (patch)
treee23f0b442bdaf8998487d7bedff2f0cb3851a507 /Source/cmake.cxx
parent123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0 (diff)
downloadCMake-91a021146c7a8eb256eca7bb3d9be3acfe3ce814.zip
CMake-91a021146c7a8eb256eca7bb3d9be3acfe3ce814.tar.gz
CMake-91a021146c7a8eb256eca7bb3d9be3acfe3ce814.tar.bz2
Simplify some calls to cmGlobalGenerator::Build
Code paths that look up CMAKE_MAKE_PROGRAM from the cache only to pass it to Build, which only passes it to GenerateBuildCommand, no longer need to do so. GenerateBuildCommand now knows how to look up CMAKE_MAKE_PROGRAM in the cache when no explicit value is given, so simply pass 0 now.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 16a6240..bf27c78 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2663,23 +2663,16 @@ int cmake::Build(const std::string& dir,
this->CreateGlobalGenerator(it.GetValue()));
std::string output;
std::string projName;
- std::string makeProgram;
if(!it.Find("CMAKE_PROJECT_NAME"))
{
std::cerr << "Error: could not find CMAKE_PROJECT_NAME in Cache\n";
return 1;
}
projName = it.GetValue();
- if(!it.Find("CMAKE_MAKE_PROGRAM"))
- {
- std::cerr << "Error: could not find CMAKE_MAKE_PROGRAM in Cache\n";
- return 1;
- }
- makeProgram = it.GetValue();
return gen->Build(0, dir.c_str(),
projName.c_str(), target.c_str(),
&output,
- makeProgram.c_str(),
+ 0,
config.c_str(), clean, false, 0,
cmSystemTools::OUTPUT_PASSTHROUGH,
nativeOptions);