Forráskód Böngészése

Merge topic 'xcode-sdk-version'

540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
Brad King 9 éve
szülő
commit
1a5fddfe6d
1 módosított fájl, 4 hozzáadás és 2 törlés
  1. 4 2
      Modules/Platform/Darwin-Initialize.cmake

+ 4 - 2
Modules/Platform/Darwin-Initialize.cmake

@@ -125,8 +125,10 @@ if(CMAKE_OSX_SYSROOT)
       set(_CMAKE_OSX_SYSROOT_ORIG "")
       set(_CMAKE_OSX_SYSROOT_ORIG "")
     endif()
     endif()
     set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
     set(_CMAKE_OSX_SYSROOT_PATH "${CMAKE_OSX_SYSROOT}")
-  else()
-    # Transform the sdk name into a path.
+  endif()
+
+  if(CMAKE_OSX_SYSROOT)
+    # Transform the (maybe unversioned) sysroot into a versioned path.
     execute_process(
     execute_process(
       COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
       COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version Path
       OUTPUT_VARIABLE _stdout
       OUTPUT_VARIABLE _stdout