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 /Tests/RunCMake/build_command | |
| 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 'Tests/RunCMake/build_command')
| -rw-r--r-- | Tests/RunCMake/build_command/ErrorsCommon.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/build_command/ErrorsCommon.cmake b/Tests/RunCMake/build_command/ErrorsCommon.cmake index d224539..f007b88 100644 --- a/Tests/RunCMake/build_command/ErrorsCommon.cmake +++ b/Tests/RunCMake/build_command/ErrorsCommon.cmake @@ -37,9 +37,9 @@ build_command(cmd) message("4. cmd='${cmd}'") # Test the two-arg legacy signature: -build_command(legacy_cmd ${CMAKE_BUILD_TOOL}) +build_command(legacy_cmd ${CMAKE_MAKE_PROGRAM}) message("5. legacy_cmd='${legacy_cmd}'") -message(" CMAKE_BUILD_TOOL='${CMAKE_BUILD_TOOL}'") +message(" CMAKE_MAKE_PROGRAM='${CMAKE_MAKE_PROGRAM}'") # Test the optional KEYWORDs: build_command(cmd CONFIGURATION hoohaaConfig) |