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 19:32:56 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-03-15 19:32:56 +0400
commit4022c52cfab4c497bf0e42663905437d459ebfe4 (patch)
tree91e3c857debaff42f3471adb449626e3a7b965c7 /CMakeLists.txt
parentf2475088b682041f0deff2fce3734c22c0a744e1 (diff)
OSX/cmake: move the xcode 4.3 warning up, it was not shown due error happened before, masking it
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6345697d5f..92abb54a32f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,18 +267,18 @@ if(APPLE)
endif()
if(${CMAKE_GENERATOR} MATCHES "Xcode")
+
+ ##### workaround for actual official cmake incompatibility with xcode 4.3 #####
+ if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
+ message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
+ endif()
+ ### end workaround for actual official cmake incompatibility with xcode 4.3 ###
+
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 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})
-
- ##### workaround for actual official cmake incompatibility with xcode 4.3 #####
- if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
- message("Official cmake does not yet support Xcode 4.3, get a patched version here: http://www.jensverwiebe.de/Blender/CMake%202.8-7patched.zip")
- endif()
- ##### end workaround for actual official cmake incompatibility with xcode 4.3 #####
-
endif()
else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )