r14454 by cbradney - Minor CMake adjustments for OSX

scribus-commit scribus-commit at lists.scribus.net
Fri Jan 1 20:45:16 CET 2010


Revision: 14454
Author: cbradney
Date: 2010-01-01T07:09:05.952308Z
Commit message: Minor CMake adjustments for OSX

Changeset: 
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14453)
+++ CMakeLists.txt	(revision 14454)
@@ -344,12 +344,13 @@
     SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
     SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
     SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+	SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
   ELSE(WANT_UNIVERSAL_BUNDLE)
     IF(ARCH_PPC OR ARCH_PPC_64)
       MESSAGE("Setting PPC Architecture for OSX Build/Bundle")
       SET(CMAKE_OSX_ARCHITECTURES "ppc" )
       SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
-	ELSE(ARCH_PPC OR ARCH_PPC_64 OR APPLE_10_6_X)
+	ELSE(ARCH_PPC OR ARCH_PPC_64)
 	  IF(APPLE_10_6_X)
 		MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
 		SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
@@ -359,7 +360,6 @@
 		SET(CMAKE_OSX_ARCHITECTURES "i386" )
 		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
 	  ENDIF(APPLE_10_6_X)
-
     ENDIF(ARCH_PPC OR ARCH_PPC_64)
   ENDIF(WANT_UNIVERSAL_BUNDLE)
   MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")




More information about the scribus-commit mailing list