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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2015-10-04 18:57:14 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2015-10-04 19:11:08 +0300
commitfccb14b5d2f679167f35b9ba548c09dfcc1e54f0 (patch)
tree8fa4c95d5f7dda67f15f36ebf4dfeabeae770871 /CMakeLists.txt
parentf2499b601514755819c2db4876b8ec677b45285e (diff)
CMake: detect OS X 10.11 / Xcode 7.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index deafa90dbb5..029198f7064 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -511,7 +511,11 @@ if(APPLE)
endif()
execute_process(COMMAND uname -r OUTPUT_VARIABLE MAC_SYS) # check for actual system-version
- if(${MAC_SYS} MATCHES 14)
+ if(${MAC_SYS} MATCHES 15)
+ set(OSX_SYSTEM 10.11)
+ # throw an error here, older cmake cannot handle 2 digit subversion!
+ cmake_minimum_required(VERSION 3.0.0)
+ 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)