r19229 by craig - Add more OSX versions to the list

[scribus-commit]

Author: craig
Date: Sat Jun 14 23:24:09 2014
New Revision: 19229

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19229
Log:
Add more OSX versions to the list

Modified:
    trunk/Scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19229&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sat Jun 14 23:24:09 2014
@@ -336,11 +336,27 @@
 
 #Based on our build type, setup our build options
 IF(APPLE)
-  IF(APPLE_10_6_X)
-    SET(OSXMINVER "10.6" CACHE TYPE STRING)
-  ELSE(APPLE_10_6_X)
-    SET(OSXMINVER "10.4" CACHE TYPE STRING)
-  ENDIF(APPLE_10_6_X)
+	IF(APPLE_10_10_X)
+		SET(OSXMINVER "10.10" CACHE TYPE STRING)
+	ENDIF(APPLE_10_10_X)
+	IF(APPLE_10_9_X)
+		SET(OSXMINVER "10.9" CACHE TYPE STRING)
+	ENDIF(APPLE_10_9_X)
+	IF(APPLE_10_8_X)
+		SET(OSXMINVER "10.8" CACHE TYPE STRING)
+	ENDIF(APPLE_10_8_X)
+	IF(APPLE_10_7_X)
+		SET(OSXMINVER "10.7" CACHE TYPE STRING)
+	ENDIF(APPLE_10_7_X)
+	IF(APPLE_10_6_X)
+		SET(OSXMINVER "10.6" CACHE TYPE STRING)
+	ENDIF(APPLE_10_6_X)
+	IF(APPLE_10_5_X)
+		SET(OSXMINVER "10.5" CACHE TYPE STRING)
+	ENDIF(APPLE_10_5_X)
+	IF(APPLE_10_4_X)
+		SET(OSXMINVER "10.4" CACHE TYPE STRING)
+	ENDIF(APPLE_10_4_X)
   # gcc/mac
   IF(WANT_UNIVERSAL_BUNDLE)
     MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
@@ -354,15 +370,15 @@
       SET(CMAKE_OSX_ARCHITECTURES "ppc" )
       SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
 	ELSE(ARCH_PPC OR ARCH_PPC_64)
-	  IF(APPLE_10_6_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)
 		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)
+	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 i386 Architecture for OSX Build/Bundle")
 		SET(CMAKE_OSX_ARCHITECTURES "i386" )
 		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
-	  ENDIF(APPLE_10_6_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)
     ENDIF(ARCH_PPC OR ARCH_PPC_64)
   ENDIF(WANT_UNIVERSAL_BUNDLE)
   MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")