r14374 by cbradney - Minor fixes to 64 bit Snow Leopard detection

[scribus-commit]

Revision: 14374
Author: cbradney
Date: 2009-12-02T14:03:31.196640Z
Commit message: Minor fixes to 64 bit Snow Leopard detection

Changeset: 
M  /trunk/Scribus/CMakeLists.txt

Diffs:
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14373)
+++ CMakeLists.txt	(revision 14374)
@@ -105,7 +105,7 @@
   MESSAGE(STATUS "Found Snow Leopard Target: Apple, 64 bit, X86")
   UNSET(ARCH_X86)
   SET(ARCH_X86_64 1)
-  SET(APPLE_10_6_X 1)
+  SET(APPLE_10_6_X 1 CACHE TYPE BOOL)
 ENDIF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND ARCH_X86 EQUAL 1)
 
 STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}")
@@ -333,32 +333,32 @@
 
 #Based on our build type, setup our build options
 IF(APPLE)
-  IF (APPLE_10_6_X)
-	SET(OSXMINVER "10.6" CACHE TYPE STRING)
-  ELSEIF (APPLE_10_6_X)
-	SET(OSXMINVER "10.4" CACHE TYPE STRING)
-  ENDIF (APPLE_10_6_X)
+  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)
   # gcc/mac
   IF(WANT_UNIVERSAL_BUNDLE)
     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_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+    SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
   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)
-	  IF (APPLE_10_6_X)
+	  IF(APPLE_10_6_X)
 		MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
 		SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
 		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
-	  ELSEIF (APPLE_10_6_X)
+	  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" )
-	  ENDIF (APPLE_10_6_X)
+	  ENDIF(APPLE_10_6_X)
 
     ENDIF(ARCH_PPC OR ARCH_PPC_64)
   ENDIF(WANT_UNIVERSAL_BUNDLE)