r19234 by craig - Add better OSX version detection for SDKs

scribus-commit scribus-commit at lists.scribus.net
Sun Jun 15 09:22:08 UTC 2014


Author: craig
Date: Sun Jun 15 09:22:08 2014
New Revision: 19234

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19234
Log:
Add better OSX version detection for SDKs

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19234&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Jun 15 09:22:08 2014
@@ -366,9 +366,11 @@
 	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")
 	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")
 	ENDIF(APPLE_10_8_X)
 	IF(APPLE_10_7_X)
 		SET(OSXMINVER "10.7" CACHE TYPE STRING)
@@ -395,6 +397,7 @@
 			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(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" )




More information about the scribus-commit mailing list