Text archives Help

---

Author: bigler
Date: Thu Jan 24 07:15:59 2008
New Revision: 2002

Modified:
   trunk/CMake/ConfigArchitecture.cmake
   trunk/CMake/ConfigCompilerFlags.cmake
Log:
CMake/ConfigArchitecture.cmake

  Added a note about COMPARE_VERSION_STRINGS and changed "9.0.0" to "9".

CMake/ConfigCompilerFlags.cmake

  You can't dereference the APPLE_LEOPARD variable (i.e. ${APPLE_LEOPARD}),
  because that variable is only defined when true.  This is the case for most 
of
  the cmake variables we define.


Modified: trunk/CMake/ConfigArchitecture.cmake
==============================================================================
--- trunk/CMake/ConfigArchitecture.cmake        (original)
+++ trunk/CMake/ConfigArchitecture.cmake        Thu Jan 24 07:15:59 2008
@@ -16,7 +16,8 @@
 
   EXEC_PROGRAM("/usr/bin/uname" ARGS "-r" OUTPUT_VARIABLE APPLE_VERSION)
 
-  COMPARE_VERSION_STRINGS(${APPLE_VERSION} "9.0.0" APPLE_LEOPARD_CMP)
+  # "9" will expand with .0's to compare against additional dot versions.
+  COMPARE_VERSION_STRINGS(${APPLE_VERSION} "9" APPLE_LEOPARD_CMP)
   # Apple G4
   IF (APPLE_MACHINE MATCHES "ppc7450")
     SET(APPLE_G4 TRUE)

Modified: trunk/CMake/ConfigCompilerFlags.cmake
==============================================================================
--- trunk/CMake/ConfigCompilerFlags.cmake       (original)
+++ trunk/CMake/ConfigCompilerFlags.cmake       Thu Jan 24 07:15:59 2008
@@ -151,7 +151,13 @@
     APPEND_TO_STRING(GCC_OPT "-msse -msse2 -msse3 -mfpmath=sse")
   ENDIF (APPLE_X86)
 
-  FIRST_TIME_SET(MANTA_TARGET_LEOPARD ${APPLE_LEOPARD} BOOL "Target Leopard")
+  # You can't dereference the APPLE_LEOPARD variable (i.e. ${APPLE_LEOPARD}),
+  # because that variable is only defined when true.
+  IF(APPLE_LEOPARD)
+    FIRST_TIME_SET(MANTA_TARGET_LEOPARD TRUE BOOL "Target Leopard")
+  ELSE(APPLE_LEOPARD)
+    FIRST_TIME_SET(MANTA_TARGET_LEOPARD FALSE BOOL "Target Leopard")
+  ENDIF(APPLE_LEOPARD)
 
   IF(MANTA_TARGET_LEOPARD)
     ADD_DEFINITIONS(-DAPPLE_LEOPARD)

---

• [Manta] r2002 - trunk/CMake, bigler, 01/24/2008

---

Archive powered by MHonArc 2.6.16.