mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Xcode: Switch to internal CMAKE_MAKE_PROGRAM lookup by generator (#15324)

Browse Source 
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.
This commit is contained in:
Brad King
2015-01-28 14:00:02 -05:00
parent 11e2e6cadf
commit ab9fa54d48
7 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CMakeFindXCode.cmake
View File

@@ -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.