| 1 | diff -ur cmake-2.8.7-orig/Modules/Platform/Darwin.cmake cmake-2.8.7/Modules/Platform/Darwin.cmake |
| 2 | --- Modules/Platform/Darwin.cmake 2012-02-27 16:55:54.000000000 +0100 |
| 3 | +++ Modules/Platform/Darwin.cmake 2012-03-01 14:37:31.000000000 +0100 |
| 4 | @@ -58,20 +58,22 @@ |
| 5 | |
| 6 | # Set the assumed (Pre 10.5 or Default) location of the developer tools |
| 7 | SET(OSX_DEVELOPER_ROOT "/Developer") |
| 8 | +# Use the xcode-select tool if it's available (Xcode >= 3.0 installations) |
| 9 | +FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select) |
| 10 | +IF(CMAKE_XCODE_SELECT) |
| 11 | + EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path" |
| 12 | + OUTPUT_VARIABLE OSX_DEVELOPER_ROOT |
| 13 | + OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 14 | +ENDIF(CMAKE_XCODE_SELECT) |
| 15 | |
| 16 | # Find installed SDKs |
| 17 | -FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*") |
| 18 | - |
| 19 | -# If nothing is found there, then try locating the dev tools based on the xcode-select tool |
| 20 | -# (available in Xcode >= 3.0 installations) |
| 21 | +# Start with pre-Xcode-4.3 default SDKs directory |
| 22 | +SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/SDKs") |
| 23 | +FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*") |
| 24 | +# If not present, try 4.3+ SDKs directory |
| 25 | IF(NOT _CMAKE_OSX_SDKS) |
| 26 | - FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select) |
| 27 | - IF(CMAKE_XCODE_SELECT) |
| 28 | - EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path" |
| 29 | - OUTPUT_VARIABLE OSX_DEVELOPER_ROOT |
| 30 | - OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 31 | - FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*") |
| 32 | - ENDIF(CMAKE_XCODE_SELECT) |
| 33 | + SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/Platforms/MacOSX.platform/Developer/SDKs") |
| 34 | + FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*") |
| 35 | ENDIF(NOT _CMAKE_OSX_SDKS) |
| 36 | |
| 37 | EXECUTE_PROCESS(COMMAND sw_vers -productVersion |
| 38 | @@ -103,16 +105,16 @@ |
| 39 | # Set CMAKE_OSX_SYSROOT_DEFAULT based on _CURRENT_OSX_VERSION, |
| 40 | # accounting for the known specially named SDKs. |
| 41 | SET(CMAKE_OSX_SYSROOT_DEFAULT |
| 42 | - "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX${_CURRENT_OSX_VERSION}.sdk") |
| 43 | + "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CURRENT_OSX_VERSION}.sdk") |
| 44 | |
| 45 | IF(_CURRENT_OSX_VERSION STREQUAL "10.4") |
| 46 | SET(CMAKE_OSX_SYSROOT_DEFAULT |
| 47 | - "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.4u.sdk") |
| 48 | + "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.4u.sdk") |
| 49 | ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.4") |
| 50 | |
| 51 | IF(_CURRENT_OSX_VERSION STREQUAL "10.3") |
| 52 | SET(CMAKE_OSX_SYSROOT_DEFAULT |
| 53 | - "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.3.9.sdk") |
| 54 | + "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.3.9.sdk") |
| 55 | ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.3") |
| 56 | |
| 57 | # Use environment or default as initial cache value: |
| 58 | diff -ur cmake-2.8.7-orig/Source/cmGlobalXCodeGenerator.cxx cmake-2.8.7/Source/cmGlobalXCodeGenerator.cxx |
| 59 | --- Source/cmGlobalXCodeGenerator.cxx 2012-02-27 16:55:54.000000000 +0100 |
| 60 | +++ Source/cmGlobalXCodeGenerator.cxx 2012-02-27 17:11:59.000000000 +0100 |
| 61 | @@ -135,8 +135,16 @@ |
| 62 | { |
| 63 | #if defined(CMAKE_BUILD_WITH_CMAKE) |
| 64 | cmXcodeVersionParser parser; |
| 65 | - parser.ParseFile |
| 66 | - ("/Developer/Applications/Xcode.app/Contents/version.plist"); |
| 67 | + if (cmSystemTools::FileExists("/Applications/Xcode.app/Contents/version.plist")) |
| 68 | + { |
| 69 | + parser.ParseFile |
| 70 | + ("/Applications/Xcode.app/Contents/version.plist"); |
| 71 | + } |
| 72 | + else |
| 73 | + { |
| 74 | + parser.ParseFile |
| 75 | + ("/Developer/Applications/Xcode.app/Contents/version.plist"); |
| 76 | + } |
| 77 | cmsys::auto_ptr<cmGlobalXCodeGenerator> |
| 78 | gg(new cmGlobalXCodeGenerator(parser.Version)); |
| 79 | if (gg->XcodeVersion == 20) |