Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2012-03-15 03:42:46 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-03-15 03:42:46 +0400
commit23c1edb7779ba870c23a29aa200db3c882f39247 (patch)
tree61bdc890bf5add8a95d24d37902a8e4804a8e5bd /CMakeLists.txt
parentea79c470d2e14a5116845ed73fa70bcfbc213899 (diff)
OSX/cmake: enable clang compiler with xcode >= 4.3, tested o.k.now
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c40aa64f213..c6345697d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,9 +267,9 @@ if(APPLE)
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})