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

OSX/cmake: rollback ca5bbe0e41 cause OSX versions can have not subversion thus sw_vers -productVersion is not usable for sdk setting

Browse Source
This commit is contained in:
Jens Verwiebe
2013-11-15 23:20:16 +01:00
parent a7d292ee4e
commit f8eb006d09
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@@ -307,13 +307,21 @@ if(APPLE)
FORCE) FORCE)
endif() endif()
execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE MAC_SYS OUTPUT_STRIP_TRAILING_WHITESPACE) # check for actual system-version execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
if( ${MAC_SYS} VERSION_LESS 10.5) if(${MAC_SYS} MATCHES 13)
set(OSX_SYSTEM unsupported) set(OSX_SYSTEM 10.9)
else() elseif(${MAC_SYS} MATCHES 12)
set(OSX_SYSTEM ${MAC_SYS}) set(OSX_SYSTEM 10.8)
endif() elseif(${MAC_SYS} MATCHES 11)
message(STATUS "Detected system-version: " ${OSX_SYSTEM}) 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()
message(STATUS "Detected system-version: " ${OSX_SYSTEM})
# 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>