r14697 by cbradney - Some CMake fixes for OSX builds

scribus-commit scribus-commit at lists.scribus.net
Fri Feb 12 23:40:16 CET 2010


Revision: 14697
Author: cbradney
Date: 2010-02-12T22:33:56.294779Z
Commit message: Some CMake fixes for OSX builds

Changeset: 
M  /branches/Version135/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14696)
+++ CMakeLists.txt	(revision 14697)
@@ -348,7 +348,7 @@
 IF(APPLE)
   IF(APPLE_10_6_X)
     SET(OSXMINVER "10.6" CACHE TYPE STRING)
-  ELSEIF (APPLE_10_6_X)
+  ELSE(APPLE_10_6_X)
     SET(OSXMINVER "10.4" CACHE TYPE STRING)
   ENDIF(APPLE_10_6_X)
   # gcc/mac
@@ -356,6 +356,7 @@
     MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
     SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
     SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
+    SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
     SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
   ELSE(WANT_UNIVERSAL_BUNDLE)
     IF(ARCH_PPC OR ARCH_PPC_64)
@@ -367,14 +368,17 @@
         MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
         SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
         SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
+#        SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.6")
       ELSE(APPLE_10_6_X)
         MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
         SET(CMAKE_OSX_ARCHITECTURES "i386" )
         SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
+#        SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
       ENDIF(APPLE_10_6_X)
     ENDIF(ARCH_PPC OR ARCH_PPC_64)
   ENDIF(WANT_UNIVERSAL_BUNDLE)
   MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
+  MESSAGE(STATUS "OSX Minimum Version: ${OSXMINVER}")
   SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
   SET( ENV{LD_PREBIND} 1 )
   SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )




More information about the scribus-commit mailing list