[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60140] trunk/blender/CMakeLists.txt: OSX/ cmake: don't try get xcode path from xcode before 4.3, developer dir was not bundled in this case

jens verwiebe info at jensverwiebe.de
Sat Sep 14 14:11:26 CEST 2013


Revision: 60140
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60140
Author:   jensverwiebe
Date:     2013-09-14 12:11:26 +0000 (Sat, 14 Sep 2013)
Log Message:
-----------
OSX/cmake: don't try get xcode path from xcode before 4.3, developer dir was not bundled in this case

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-09-14 12:04:10 UTC (rev 60139)
+++ trunk/blender/CMakeLists.txt	2013-09-14 12:11:26 UTC (rev 60140)
@@ -326,9 +326,11 @@
 	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})
-	string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
-	if(${DP_NAME} MATCHES Xcode5)
-		set(XCODE_VERSION 5)
+	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")




More information about the Bf-blender-cvs mailing list