r19260 by craig - Move OSX SDK and OSX DEPLOYMENT TARGET setting within WANT_OSX_SDK option

[scribus-commit]

Author: craig
Date: Sat Jun 21 20:12:32 2014
New Revision: 19260

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19260
Log:
Move OSX SDK and OSX DEPLOYMENT TARGET setting within WANT_OSX_SDK option

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19260&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sat Jun 21 20:12:32 2014
@@ -363,45 +363,63 @@
 IF(APPLE)
 	IF(APPLE_10_10_X)
 		SET(OSXMINVER "10.10" CACHE TYPE STRING)
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_10_X)
 	IF(APPLE_10_9_X)
 		SET(OSXMINVER "10.9" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_9_X)
 	IF(APPLE_10_8_X)
 		SET(OSXMINVER "10.8" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_8_X)
 	IF(APPLE_10_7_X)
 		SET(OSXMINVER "10.7" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_7_X)
 	IF(APPLE_10_6_X)
 		SET(OSXMINVER "10.6" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_6_X)
 	IF(APPLE_10_5_X)
 		SET(OSXMINVER "10.5" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_5_X)
 	IF(APPLE_10_4_X)
 		SET(OSXMINVER "10.4" CACHE TYPE STRING)
-		#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+		ENDIF (WANT_OSX_SDK)
 	ENDIF(APPLE_10_4_X)
 	# gcc/mac
 	IF(WANT_UNIVERSAL_BUNDLE)
 		MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
 		SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
 		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
-		#SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
-		SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+		ENDIF (WANT_OSX_SDK)
 	ELSE(WANT_UNIVERSAL_BUNDLE)
 		IF(ARCH_PPC OR ARCH_PPC_64)
 			MESSAGE("Setting PPC Architecture for OSX Build/Bundle")
 			SET(CMAKE_OSX_ARCHITECTURES "ppc" )
 			SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
 		ELSE(ARCH_PPC OR ARCH_PPC_64)
-			SET(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
+			IF (WANT_OSX_SDK)
+				SET(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
+			ENDIF (WANT_OSX_SDK)
 			IF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
 				MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
 				SET(CMAKE_OSX_ARCHITECTURES "x86_64" )