[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60116] trunk/blender/CMakeLists.txt: OSX/ cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile

[jens verwiebe]

Revision: 60116
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60116
Author:   jensverwiebe
Date:     2013-09-13 21:13:57 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
OSX/cmake: move the new xcode-select-handing outside xcode conditional, to fix cmake/make compile

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-09-13 21:08:10 UTC (rev 60115)
+++ trunk/blender/CMakeLists.txt	2013-09-13 21:13:57 UTC (rev 60116)
@@ -320,18 +320,18 @@
 		set(OSX_SYSTEM unsupported)
 	endif()
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+	
+	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+	# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+	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)
+	endif()
+	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
-	
-		# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
-		# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
-		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)
-		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