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/cmGlobalGenerator.h | |
| 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/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 37e12ff..74d88f3 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -334,6 +334,8 @@ protected: typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > AutogensType; void CreateQtAutoGeneratorsTargets(AutogensType& autogens); + std::string SelectMakeProgram(const char* makeProgram, + std::string makeDefault = ""); // Fill the ProjectMap, this must be called after LocalGenerators // has been populated. |