Revision: 44905
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44905
Author: jensverwiebe
Date: 2012-03-15 15:32:56 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
OSX/cmake: move the xcode 4.3 warning up, it was not shown due error happened
before, masking it
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-03-15 14:57:51 UTC (rev 44904)
+++ trunk/blender/CMakeLists.txt 2012-03-15 15:32:56 UTC (rev 44905)
@@ -267,18 +267,18 @@
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 )
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
