Revision: 44279
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44279
Author: blendix
Date: 2012-02-20 14:19:45 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Fix cmake warning on Mac, when not using Xcode generator.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-02-20 14:19:34 UTC (rev 44278)
+++ trunk/blender/CMakeLists.txt 2012-02-20 14:19:45 UTC (rev 44279)
@@ -254,11 +254,14 @@
"Choose the minimum OSX version required: 10.4 or 10.5"
FORCE)
endif()
- if(${CMAKE_GENERATOR} MATCHES "Xcode" AND (${XCODE_VERSION}
VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4))
- # 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})
+ MESSAGE(STATUS ${CMAKE_GENERATOR})
+ if(${CMAKE_GENERATOR} MATCHES "Xcode")
+ if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION}
VERSION_GREATER 4)
+ # 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()
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
