[Bf-blender-cvs] [fccb14b] master: CMake: detect OS X 10.11 / Xcode 7.

Brecht Van Lommel noreply at git.blender.org
Sun Oct 4 18:11:28 CEST 2015


Commit: fccb14b5d2f679167f35b9ba548c09dfcc1e54f0
Author: Brecht Van Lommel
Date:   Sun Oct 4 17:57:14 2015 +0200
Branches: master
https://developer.blender.org/rBfccb14b5d2f679167f35b9ba548c09dfcc1e54f0

CMake: detect OS X 10.11 / Xcode 7.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index deafa90..029198f 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)




More information about the Bf-blender-cvs mailing list