[Bf-blender-cvs] [20679ca25c9] blender-v3.3-release: Build: get make deps working with Xcode command line tools

[Brecht Van Lommel]

Commit: 20679ca25c9c0dd3f2f73b9491fd706f311b68b8
Author: Brecht Van Lommel
Date:   Mon Oct 3 16:47:03 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB20679ca25c9c0dd3f2f73b9491fd706f311b68b8

Build: get make deps working with Xcode command line tools

Deduplicating code with Xcode detection for Blender builds.

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

M	build_files/build_environment/cmake/options.cmake

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

diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 299b82f6d05..6e5f9df20b4 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -101,34 +101,16 @@ else()
   set(LIBPREFIX "lib")
 
   if(APPLE)
-    # Let's get the current Xcode dir, to support xcode-select
-    execute_process(
-      COMMAND xcode-select --print-path
-      OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-      COMMAND xcodebuild -version -sdk macosx SDKVersion
-      OUTPUT_VARIABLE MACOSX_SDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if(NOT CMAKE_OSX_ARCHITECTURES)
-      execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
-      message(STATUS "Detected native architecture ${ARCHITECTURE}.")
-      set(CMAKE_OSX_ARCHITECTURES "${ARCHITECTURE}")
-    endif()
-    if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
-      set(OSX_DEPLOYMENT_TARGET 10.13)
-    else()
-      set(OSX_DEPLOYMENT_TARGET 11.00)
-    endif()
-    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
+    # Use same Xcode detection as Blender itself.
+    include(../cmake/platform/platform_apple_xcode.cmake)
 
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
       set(BLENDER_PLATFORM_ARM ON)
     endif()
 
-    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
-    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+    set(PLATFORM_LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
       set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
     else()
@@ -136,8 +118,8 @@ else()
     endif()
     set(PLATFORM_CMAKE_FLAGS
       -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
     )
   else()
     if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
@@ -171,8 +153,8 @@ else()
   set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
 
   set(CONFIGURE_ENV
-    export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
-    export MACOSX_SDK_VERSION=${OSX_DEPLOYMENT_TARGET} &&
+    export MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} &&
+    export MACOSX_SDK_VERSION=${CMAKE_OSX_DEPLOYMENT_TARGET} &&
     export CFLAGS=${PLATFORM_CFLAGS} &&
     export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
     export LDFLAGS=${PLATFORM_LDFLAGS}