Commit: 2e7d3ad7b51bbc05cdcbbc3c055f961f3a2c28a8 Author: Ankit Meel Date: Thu May 20 21:55:58 2021 +0530 Branches: blender-v2.93-release https://developer.blender.org/rB2e7d3ad7b51bbc05cdcbbc3c055f961f3a2c28a8
macOS build: set minimum deployment target correctly Make `CMAKE_OSX_DEPLOYMENT_TARGET` independent of buildbot settings and always set to `OSX_MIN_DEPLOYMENT_TARGET`. That fixes the launch error on OS older than buildbot's. Remove unused `MACOSX_DEPLOYMENT_TARGET`. Fix T88419 Diff D11323 =================================================================== M build_files/cmake/platform/platform_apple.cmake M build_files/cmake/platform/platform_apple_xcode.cmake =================================================================== diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a5eee46349a..fe9dd6a58de 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -20,12 +20,6 @@ # Libraries configuration for Apple. -if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") - set(MACOSX_DEPLOYMENT_TARGET 11.00) -else() - set(MACOSX_DEPLOYMENT_TARGET 10.13) -endif() - macro(find_package_wrapper) # do nothing, just satisfy the macro endmacro() diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 4d15fee75b7..639d7e43afd 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -168,21 +168,15 @@ endif() unset(OSX_SDKROOT) -# 10.13 is our min. target, if you use higher sdk, weak linking happens if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") + # M1 chips run Big Sur onwards. set(OSX_MIN_DEPLOYMENT_TARGET 11.00) else() + # 10.13 is our min. target, if you use higher sdk, weak linking happens set(OSX_MIN_DEPLOYMENT_TARGET 10.13) endif() -if(CMAKE_OSX_DEPLOYMENT_TARGET) - if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS ${OSX_MIN_DEPLOYMENT_TARGET}) - message(STATUS "Setting deployment target to ${OSX_MIN_DEPLOYMENT_TARGET}, lower versions are not supported") - set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE) - endif() -else() - set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE) -endif() +set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSX_MIN_DEPLOYMENT_TARGET}" CACHE STRING "" FORCE) if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode") # Force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else (CMake bug?) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs