[Bf-blender-cvs] [704f56d68f3] blender-v2.83-release: macOS build: set minimum deployment target correctly
Ankit Meel
noreply at git.blender.org
Thu May 20 19:10:00 CEST 2021
Commit: 704f56d68f3ed83e6350f182fcf9aa45a19ded41
Author: Ankit Meel
Date: Thu May 20 22:38:57 2021 +0530
Branches: blender-v2.83-release
https://developer.blender.org/rB704f56d68f3ed83e6350f182fcf9aa45a19ded41
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
===================================================================
M build_files/cmake/platform/platform_apple_xcode.cmake
===================================================================
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?)
More information about the Bf-blender-cvs
mailing list