[Bf-blender-cvs] [a0931126966] master: CMake: Fix compilation with Xcode generation on Xcode 11.4

[Sergey Sharybin]

Commit: a093112696685c160e71a5b51eb8cc3454eaa4b4
Author: Sergey Sharybin
Date:   Thu Mar 26 13:07:19 2020 +0100
Branches: master
https://developer.blender.org/rBa093112696685c160e71a5b51eb8cc3454eaa4b4

CMake: Fix compilation with Xcode generation on Xcode 11.4

Need to give correct SDKROOT.

===================================================================

M	build_files/cmake/platform/platform_apple_xcode.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake
index bbadb9deb97..f1f02c151ee 100644
--- a/build_files/cmake/platform/platform_apple_xcode.cmake
+++ b/build_files/cmake/platform/platform_apple_xcode.cmake
@@ -104,10 +104,12 @@ endif()
 set(OSX_SDK_PATH)
 set(OSX_SDK_FOUND FALSE)
 set(OSX_SDK_PREFIX ${OSX_SYSROOT_PREFIX}/Developer/SDKs)
+set(OSX_SDKROOT)
 foreach(OSX_SDK_VERSION ${OSX_SDK_TEST_VERSIONS})
   set(CURRENT_OSX_SDK_PATH "${OSX_SDK_PREFIX}/MacOSX${OSX_SDK_VERSION}.sdk")
   if(EXISTS ${CURRENT_OSX_SDK_PATH})
     set(OSX_SDK_PATH "${CURRENT_OSX_SDK_PATH}")
+    set(OSX_SDKROOT macosx${OSX_SDK_VERSION})
     set(OSX_SDK_FOUND TRUE)
     break()
   endif()
@@ -127,8 +129,9 @@ unset(OSX_SDK_FOUND)
 
 if(${CMAKE_GENERATOR} MATCHES "Xcode")
   # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
-  set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
+  set(CMAKE_XCODE_ATTRIBUTE_SDKROOT ${OSX_SDKROOT})
 endif()
+unset(OSX_SDKROOT)
 
 # 10.11 is our min. target, if you use higher sdk, weak linking happens
 if(CMAKE_OSX_DEPLOYMENT_TARGET)