Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-11-16 02:20:16 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-11-16 02:20:38 +0400
commitf8eb006d091d598269fc10ae9e9ebf6c6be75dbd (patch)
tree19700e6360428dc41aa36921f875e31ae8574175 /CMakeLists.txt
parenta7d292ee4e989ee1619c4c5d55649a61e132426f (diff)
OSX/cmake: rollback ca5bbe0e419b04d16ee7eb12fa7eaffa0266815a cause OSX versions can have not subversion thus sw_vers -productVersion is not usable for sdk setting
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt22
1 files changed, 15 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe79a2d0a62..a408a8100e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,13 +307,21 @@ if(APPLE)
FORCE)
endif()
- execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE MAC_SYS OUTPUT_STRIP_TRAILING_WHITESPACE) # check for actual system-version
- if( ${MAC_SYS} VERSION_LESS 10.5)
- set(OSX_SYSTEM unsupported)
- else()
- set(OSX_SYSTEM ${MAC_SYS})
- endif()
- message(STATUS "Detected system-version: " ${OSX_SYSTEM})
+ execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
+ if(${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()
+ 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
# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>