diff options
author | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-20 19:28:34 +0300 |
---|---|---|
committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-20 19:28:34 +0300 |
commit | 677909cdc3c2380819a987a80c623a45dde5c40c (patch) | |
tree | 741adc4f5c9c97d2b0c46a0f6958bce59e4dc15a /build_files | |
parent | 9fef934530b8b515a8a959ce26c5d72663f159b1 (diff) | |
parent | 2e7d3ad7b51bbc05cdcbbc3c055f961f3a2c28a8 (diff) |
Merge branch 'blender-v2.93-release' into master
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 6 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_apple_xcode.cmake | 12 |
2 files changed, 3 insertions, 15 deletions
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?) |