r24760 by craig - Update Apple SDK locations

[scribus-commit]

Author: craig
Date: Wed Oct 27 19:34:50 2021
New Revision: 24760

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24760
Log:
Update Apple SDK locations

Modified:
    trunk/Scribus/CMakeLists_Apple.cmake

Modified: trunk/Scribus/CMakeLists_Apple.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24760&path=/trunk/Scribus/CMakeLists_Apple.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Apple.cmake	(original)
+++ trunk/Scribus/CMakeLists_Apple.cmake	Wed Oct 27 19:34:50 2021
@@ -1,7 +1,21 @@
+if(APPLE_12_00_X)
+	set(OSXMINVER "12.00" CACHE STRING "OSX 12.00")
+	if (WANT_OSX_SDK)
+		if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk"))
+			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk")
+		elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk"))
+			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk")
+		elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk"))
+			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk")
+		endif()
+	endif()
+endif()
 if(APPLE_11_00_X)
 	set(OSXMINVER "11.00" CACHE STRING "OSX 11.00")
 	if (WANT_OSX_SDK)
-		if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk"))
+		if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk"))
+			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.0.sdk")
+		elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk"))
 			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk")
 		elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk"))
 			set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk")
@@ -124,7 +138,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 OR APPLE_10_13_X OR APPLE_10_14_X OR APPLE_10_15_X OR APPLE_11_00_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 OR APPLE_10_14_X OR APPLE_10_15_X OR APPLE_11_00_X OR APPLE_12_00_X)
 			message(STATUS "Setting x86_64 Architecture for OSX Build/Bundle")
 			set(CMAKE_OSX_ARCHITECTURES "x86_64" )
 			set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )