[Bf-blender-cvs] [e2ffa583206] tmp-libs-2.93-lts: Build: get make deps working with Xcode command line tools
Brecht Van Lommel
noreply at git.blender.org
Thu Nov 24 17:29:52 CET 2022
Commit: e2ffa58320628eab5d1e9c5f65cbc7513d0f8def
Author: Brecht Van Lommel
Date: Mon Oct 3 16:47:03 2022 +0200
Branches: tmp-libs-2.93-lts
https://developer.blender.org/rBe2ffa58320628eab5d1e9c5f65cbc7513d0f8def
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 b9a2e8d259d..994a616bcb4 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -116,30 +116,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)
+ # 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(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
- 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()
@@ -147,8 +133,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()
set(PLATFORM_CFLAGS "-fPIC")
@@ -178,8 +164,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}
More information about the Bf-blender-cvs
mailing list