[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44886] trunk/blender/CMakeLists.txt: OSX/ cmake: enable clang compiler with xcode >= 4.3, tested o.k.now

jens verwiebe info at jensverwiebe.de
Thu Mar 15 00:42:49 CET 2012


Revision: 44886
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44886
Author:   jensverwiebe
Date:     2012-03-14 23:42:46 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
OSX/cmake: enable clang compiler with xcode >= 4.3, tested o.k.now

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-03-14 23:38:57 UTC (rev 44885)
+++ trunk/blender/CMakeLists.txt	2012-03-14 23:42:46 UTC (rev 44886)
@@ -267,9 +267,9 @@
 	endif()
 
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
-		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4) # AND ${XCODE_VERSION} VERSION_LESS 4.3) in the works, needs collada fix for clang and gcc 4.7
+		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
 			# Xcode 4 defaults to the Apple LLVM Compiler.
-			# Override the default compiler selection because Blender only compiles with gcc
+			# Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
 			set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
 			message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
 			




More information about the Bf-blender-cvs mailing list