diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-28 19:00:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-29 14:11:11 (GMT) |
| commit | ab9fa54d4841e5b0eff8d241ad8edb47401b0394 (patch) | |
| tree | 4675b0ba7baef215961e07d4cd03d68d4fbcd158 /Modules | |
| parent | 11e2e6cadf7f0ee36b7ccecaa11457949382b75f (diff) | |
| download | CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.zip CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.tar.gz CMake-ab9fa54d4841e5b0eff8d241ad8edb47401b0394.tar.bz2 | |
Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)
The "cmakexbuild" wrapper is not needed for Xcode 4 and above, and the
path to it may change when CMake moves. Avoid storing a specific path
to a build program in CMakeCache.txt and instead compute the value for
CMAKE_MAKE_PROGRAM on demand. However, if a user does set the value
explicitly then honor it.
This does for Xcode what commit v3.0.0-rc1~260^2~4 (VS: Switch to
internal CMAKE_MAKE_PROGRAM lookup by generators, 2013-11-15) did for
Visual Studio generators.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFindXCode.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/CMakeFindXCode.cmake b/Modules/CMakeFindXCode.cmake index 5c4f596..da0b97b 100644 --- a/Modules/CMakeFindXCode.cmake +++ b/Modules/CMakeFindXCode.cmake @@ -12,9 +12,5 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -find_program(CMAKE_MAKE_PROGRAM - NAMES xcodebuild - PATHS - /usr/bin - ) -mark_as_advanced(CMAKE_MAKE_PROGRAM) +# Empty placeholder for input dependencies in existing +# build trees produced by older versions of CMake. |