r20460 by craig -

[scribus-commit]

Author: craig
Date: Sun Oct 11 10:03:47 2015
New Revision: 20460

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20460
Log:
Adapt CMakeLists for OSX El Capitan

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20460&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Sun Oct 11 10:03:47 2015
@@ -134,6 +134,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 "15")
+		MESSAGE(STATUS "Found OSX El Capitan Target: Apple, 64 bit, X86")
+		SET(APPLE_10_11_X 1 CACHE TYPE BOOL)
+	ENDIF (_apple_ver EQUAL "15")
 	IF (_apple_ver EQUAL "14")
 		MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
 		SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
@@ -400,6 +404,12 @@
 
 #Based on our build type, setup our build options
 IF(APPLE)
+	IF(APPLE_10_11_X)
+		SET(OSXMINVER "10.11" CACHE TYPE STRING)
+		IF (WANT_OSX_SDK)
+			SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
+		ENDIF (WANT_OSX_SDK)
+	ENDIF(APPLE_10_11_X)
 	IF(APPLE_10_10_X)
 		SET(OSXMINVER "10.10" CACHE TYPE STRING)
 		IF (WANT_OSX_SDK)
@@ -459,15 +469,15 @@
 			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)
+			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)
 				MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
 				SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
 				SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
-			ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
+			ELSE(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)
 				MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
 				SET(CMAKE_OSX_ARCHITECTURES "i386" )
 				SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
-			ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
+			ENDIF(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)
 		ENDIF(ARCH_PPC OR ARCH_PPC_64)
 	ENDIF(WANT_UNIVERSAL_BUNDLE)
 	MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")