diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-13 20:12:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 16:30:48 (GMT) |
| commit | 123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0 (patch) | |
| tree | b9f62255e7c1f8c6194e93abed2fae4875c3db58 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 5f5c92b9a2c2f9c780c08e23231b93af71f175bd (diff) | |
| download | CMake-123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0.zip CMake-123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0.tar.gz CMake-123a0608dfe6cf155f0fc095cf389ae7b3d4ebb0.tar.bz2 | |
Teach GenerateBuildCommand to find its own make program
Add a cmGlobalGenerator::SelectMakeProgram method to select a
caller-provided make program, the CMAKE_MAKE_PROGRAM cache entry, or a
generator-provided default. Call it from all implementations of the
GenerateBuildCommand method with the corresponding generator's default,
if any.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 24bfdc3..77571b2 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -559,7 +559,9 @@ void cmGlobalNinjaGenerator bool /*fast*/, std::vector<std::string> const& makeOptions) { - makeCommand.push_back(makeProgram); + makeCommand.push_back( + this->SelectMakeProgram(makeProgram) + ); makeCommand.insert(makeCommand.end(), makeOptions.begin(), makeOptions.end()); |