diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-01 18:49:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-06-02 13:53:41 +0300 |
| commit | 1418eee5f5c84d3ec24d326952e57e248e27ef96 (patch) | |
| tree | 3b644abb7bcb7581c3d630dc8e4aa86f0948e512 /build_files/cmake | |
| parent | 62fe7e9a9d0e211bc2ad4cdfedb2489c5f899133 (diff) | |
macOS: increase minimum required version to 10.11
This is in preparation of an the upcoming fix where we need to use a Metal
layer to avoid performance issue when drawing with OpenGL. Note that we already
only officially support 10.12+, the difference with this change is that Blender
will not start at all on 10.9 and 10.10.
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple_xcode.cmake | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 3fd07f5b9c5..3366d49868d 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -20,7 +20,7 @@ # Libraries configuration for Apple. -set(MACOSX_DEPLOYMENT_TARGET "10.9") +set(MACOSX_DEPLOYMENT_TARGET "10.11") macro(find_package_wrapper) # do nothing, just satisfy the macro diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 81bd6f906de..b7d43792056 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -93,19 +93,14 @@ else() endif() endif() -if(OSX_SYSTEM MATCHES 10.9) - # make sure syslibs and headers are looked up in sdk ( especially for 10.9 openGL atm. ) - set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) -endif() - -# 10.9 is our min. target, if you use higher sdk, weak linking happens +# 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.9) - message(STATUS "Setting deployment target to 10.9, lower versions are not supported") - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE) + 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.9" CACHE STRING "" FORCE) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE) endif() if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode") |