r22697 by craig - Bump CMake setup for OSX Mojave

scribus-commit scribus-commit at lists.scribus.net
Tue Sep 18 19:17:28 UTC 2018


Author: craig
Date: Tue Sep 18 19:17:28 2018
New Revision: 22697

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22697
Log:
Bump CMake setup for OSX Mojave

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22697&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Tue Sep 18 19:17:28 2018
@@ -164,6 +164,10 @@
 ## Do our Apple OSX version setup
 if (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
 	string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
+	if (_apple_ver EQUAL "18")
+		message(STATUS "Found macOS Mojave Target: Apple, 64 bit, X86")
+		set(APPLE_10_14_X 1 CACHE TYPE BOOL)
+	endif()
 	if (_apple_ver EQUAL "17")
 		message(STATUS "Found macOS High Sierra Target: Apple, 64 bit, X86")
 		set(APPLE_10_13_X 1 CACHE TYPE BOOL)
@@ -452,6 +456,16 @@
 
 #Based on our build type, setup our build options
 if(APPLE)
+	if(APPLE_10_14_X)
+		set(OSXMINVER "10.14" CACHE TYPE STRING)
+		if (WANT_OSX_SDK)
+			if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"))
+				set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk")
+			elseif(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")
+			endif()
+		endif()
+	endif()
 	if(APPLE_10_13_X)
 		set(OSXMINVER "10.13" CACHE TYPE STRING)
 		if (WANT_OSX_SDK)




More information about the scribus-commit mailing list