r22158 by craig -

scribus-commit scribus-commit at lists.scribus.net
Wed Sep 20 19:42:01 UTC 2017


Author: craig
Date: Wed Sep 20 19:42:01 2017
New Revision: 22158

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22158
Log:
Bump OSX SDKs for future OSX High Sierra release and XCode 9

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22158&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Wed Sep 20 19:42:01 2017
@@ -450,7 +450,17 @@
 
 #Based on our build type, setup our build options
 if(APPLE)
-    if(APPLE_10_12_X)
+	if(APPLE_10_13_X)
+		set(OSXMINVER "10.13" CACHE TYPE STRING)
+		if (WANT_OSX_SDK)
+			if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk"))
+				set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk")
+			elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"))
+				set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk")
+			endif()
+		endif()
+	endif()
+	if(APPLE_10_12_X)
 	    set(OSXMINVER "10.12" CACHE TYPE STRING)
 		if (WANT_OSX_SDK)
 		    if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"))
@@ -530,7 +540,7 @@
 			if (WANT_OSX_SDK)
 				set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
 			endif()
-			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 OR APPLE_10_11_X OR APPLE_10_12_X)
+			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 OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X)
 				message("Setting x86_64 Architecture for OSX Build/Bundle")
 				set(CMAKE_OSX_ARCHITECTURES "x86_64" )
 				set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )




More information about the scribus-commit mailing list