[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43846] trunk/blender/CMakeLists.txt: patch from Peter Stern to fix CMake building on OSX ( without manual editing of configuration)

Campbell Barton ideasman42 at gmail.com
Thu Feb 2 12:08:54 CET 2012


Revision: 43846
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43846
Author:   campbellbarton
Date:     2012-02-02 11:08:48 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
patch from Peter Stern to fix CMake building on OSX (without manual editing of configuration)

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-02-02 10:34:44 UTC (rev 43845)
+++ trunk/blender/CMakeLists.txt	2012-02-02 11:08:48 UTC (rev 43846)
@@ -249,6 +249,12 @@
 		"Choose the minimum OSX version required: 10.4 or 10.5"
 		FORCE)
 	endif()
+	if(${CMAKE_GENERATOR} MATCHES "Xcode" AND (${XCODE_VERSION} VERSION_GREATER 3))
+		# Xcode 4 defaults to the Apple LLVM Compiler.
+		# Override the default compiler selection because Blender only compiles with gcc
+		set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+		message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+	endif()
 	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
 	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)




More information about the Bf-blender-cvs mailing list