[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60913] trunk/blender/CMakeLists.txt: OSX/ CMake: fix ftemplate condition

jens verwiebe info at jensverwiebe.de
Thu Oct 24 20:46:00 CEST 2013


Revision: 60913
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60913
Author:   jensverwiebe
Date:     2013-10-24 18:46:00 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
OSX/CMake: fix ftemplate condition

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-10-24 18:33:41 UTC (rev 60912)
+++ trunk/blender/CMakeLists.txt	2013-10-24 18:46:00 UTC (rev 60913)
@@ -1805,13 +1805,9 @@
 		set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 	endif()
 
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		if(${CMAKE_GENERATOR} MATCHES "Xcode")
-			if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
-				# Xcode 5 has too low template depth of 128 for libmv
-				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
-			endif()
-		endif()
+	if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+		# Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
 	endif()
 endif()
 




More information about the Bf-blender-cvs mailing list