diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-13 16:33:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 13:26:23 (GMT) |
| commit | 4ac75fdfe6e7a91f3beea037d13b1f4c8c8b80ed (patch) | |
| tree | e5ff1530703c83dd1c54ed8ef72158b37260ed16 /Source/cmGlobalKdevelopGenerator.cxx | |
| parent | cc23f92861aeb2443cc5b6443c04a761c99bb100 (diff) | |
| download | CMake-4ac75fdfe6e7a91f3beea037d13b1f4c8c8b80ed.zip CMake-4ac75fdfe6e7a91f3beea037d13b1f4c8c8b80ed.tar.gz CMake-4ac75fdfe6e7a91f3beea037d13b1f4c8c8b80ed.tar.bz2 | |
Prefer CMAKE_MAKE_PROGRAM over CMAKE_BUILD_TOOL (#14548)
Historically these were both added for the Makefile and Visual Studio
generators, respectively. Later the VS generators started using the
CMAKE_MAKE_PROGRAM cache entry to find the IDE build tool, and the
CMAKE_BUILD_TOOL was simply set as an alias.
Fix the documentation to explain that CMAKE_MAKE_PROGRAM is the modern
variable and that CMAKE_BUILD_TOOL is the compatibility alias, not the
other way around. Replace uses of CMAKE_BUILD_TOOL with
CMAKE_MAKE_PROGRAM in CMake-provided modules. Nothing needs to lookup
CMAKE_BUILD_TOOL in the cache, so simply set it as a normal variable.
Diffstat (limited to 'Source/cmGlobalKdevelopGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalKdevelopGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index e7c857e..273d4bb 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -462,7 +462,7 @@ void cmGlobalKdevelopGenerator " <numberofjobs>1</numberofjobs>\n" " <dontact>false</dontact>\n" " <makebin>" << this->GlobalGenerator->GetLocalGenerators()[0]-> - GetMakefile()->GetRequiredDefinition("CMAKE_BUILD_TOOL") + GetMakefile()->GetRequiredDefinition("CMAKE_MAKE_PROGRAM") << " </makebin>\n" " <selectedenvironment>default</selectedenvironment>\n" " <environments>\n" |