[Bf-blender-cvs] [d939341] master: OSX: Fix cmake3 usage

Jens Verwiebe noreply at git.blender.org
Fri Sep 12 14:42:33 CEST 2014


Commit: d939341b65b073b8bfdc73b55d2893b77b93fc62
Author: Jens Verwiebe
Date:   Fri Sep 12 14:42:13 2014 +0200
Branches: master
https://developer.blender.org/rBd939341b65b073b8bfdc73b55d2893b77b93fc62

OSX: Fix cmake3 usage

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c063e2..a3a7a4c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,8 +316,10 @@ endif()
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
 
 if(APPLE)
-	cmake_minimum_required(VERSION 2.8.8)
-	cmake_policy(VERSION 2.8.8)
+	if(${CMAKE_VERSION} VERSION_LESS 3.0) # else breaks setting CMP0043 policy
+		cmake_minimum_required(VERSION 2.8.8)
+		cmake_policy(VERSION 2.8.8)
+	endif()
 
 	if(NOT CMAKE_OSX_ARCHITECTURES)
 		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING




More information about the Bf-blender-cvs mailing list