Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: remove OSX version lookup table

Browse Source 
This assumed the OSX SDK version matched the OSX version, which isn't always true.

Also problematic for maintenance and would make building older Blender versions on OSX fail.

Passing in pre-defined OSX_SYSTEM is also supported,
if you have multiple and want to select one.
This commit is contained in:
Campbell Barton
2016-03-10 17:56:07 +11:00
parent 9b3b0a5873
commit 751874d6bf
1 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
CMakeLists.txt
View File

@@ -503,40 +503,23 @@ endif()
# Apple # Apple
if(APPLE) if(APPLE)
if(${CMAKE_VERSION} VERSION_LESS 3.0) # else breaks setting CMP0043 policy # require newer cmake on osx because of version handling,
cmake_minimum_required(VERSION 2.8.8) # older cmake cannot handle 2 digit subversion!
cmake_policy(VERSION 2.8.8) cmake_minimum_required(VERSION 3.0.0)
endif()
if(NOT CMAKE_OSX_ARCHITECTURES) if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
"Choose the architecture you want to build Blender for: i386, x86_64 or ppc" "Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
FORCE) FORCE)
endif() endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version if(NOT DEFINED OSX_SYSTEM)
if(${MAC_SYS} MATCHES 15) execute_process(
set(OSX_SYSTEM 10.11) COMMAND xcodebuild -version -sdk macosx SDKVersion
# throw an error here, older cmake cannot handle 2 digit subversion! OUTPUT_VARIABLE OSX_SYSTEM
cmake_minimum_required(VERSION 3.0.0) OUTPUT_STRIP_TRAILING_WHITESPACE)
elseif(${MAC_SYS} MATCHES 14)
set(OSX_SYSTEM 10.10)
# throw an error here, older cmake cannot handle 2 digit subversion!
cmake_minimum_required(VERSION 3.0.0)
elseif(${MAC_SYS} MATCHES 13)
set(OSX_SYSTEM 10.9)
elseif(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM 10.8)
elseif(${MAC_SYS} MATCHES 11)
set(OSX_SYSTEM 10.7)
elseif(${MAC_SYS} MATCHES 10)
set(OSX_SYSTEM 10.6)
elseif(${MAC_SYS} MATCHES 9)
set(OSX_SYSTEM 10.5)
else()
set(OSX_SYSTEM unsupported)
endif() endif()
# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout # workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number> # but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND xcode-select --print-path OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)