diff options
author | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-20 20:08:57 +0300 |
---|---|---|
committer | Ankit Meel <ankitjmeel@gmail.com> | 2021-05-20 20:08:57 +0300 |
commit | 704f56d68f3ed83e6350f182fcf9aa45a19ded41 (patch) | |
tree | abc039028be63b8b1b96c7c2da62d30de3299d16 | |
parent | fd30365201019a003c30d14a24f8fc0299410b79 (diff) |
macOS build: set minimum deployment target correctly
Equivalent of D11323 for 2.83. Make `CMAKE_OSX_DEPLOYMENT_TARGET`
independent of buildbot settings and always set to 10.11.
That fixes the launch error on OS older than buildbot's.
Maniphest Tasks: T88419
Differential Revision: https://developer.blender.org/D11328
-rw-r--r-- | build_files/cmake/platform/platform_apple_xcode.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index f1f02c151ee..8cf5245e336 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -134,14 +134,7 @@ endif() unset(OSX_SDKROOT) # 10.11 is our min. target, if you use higher sdk, weak linking happens -if(CMAKE_OSX_DEPLOYMENT_TARGET) - if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.11) - message(STATUS "Setting deployment target to 10.11, lower versions are not supported") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE) - endif() -else() - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE) -endif() +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE) if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode") # Force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else (CMake bug?) |