[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60146] trunk/blender/CMakeLists.txt: OSX/ cmake: fix config by moving code back into xcode conditional, cmake/ makefiles does not even have xcode_vesion lookup

jens verwiebe info at jensverwiebe.de
Sun Sep 15 12:56:37 CEST 2013


Revision: 60146
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60146
Author:   jensverwiebe
Date:     2013-09-15 10:56:36 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
OSX/cmake: fix config by moving code back into xcode conditional, cmake/makefiles does not even have xcode_vesion lookup

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-09-15 08:05:27 UTC (rev 60145)
+++ trunk/blender/CMakeLists.txt	2013-09-15 10:56:36 UTC (rev 60146)
@@ -326,14 +326,15 @@
 	execute_process(COMMAND xcode-select --print-path  OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
 	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
 	message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
-	if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
-		string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
-		if(${DP_NAME} MATCHES Xcode5)
-			set(XCODE_VERSION 5)
-		endif()
-	endif()
 	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
+	
+		if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+			string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+			if(${DP_NAME} MATCHES Xcode5)
+				set(XCODE_VERSION 5)
+			endif()
+		endif()
 
 		##### cmake incompatibility with xcode  4.3 and higher #####
 		if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var




More information about the Bf-blender-cvs mailing list