Text archives Help

---

Author: abe
Date: Mon Jan  7 17:22:11 2008
New Revision: 1976

Modified:
   trunk/CMake/ConfigArchitecture.cmake
Log:

Fixed CMake if statement syntax: when using IF(${VARIABLE}, a parse
error will be generated if the variable is undefined. The intended way
was probably to use IF(VARIABLE) which evaluates as you'd expect when
VARIABLE is undefined.

In this case APPLE_LEOPARD_CMP was undefined on non-leopard systems
and therefore caused a syntax error preventing the build from being
configured.

M    ConfigArchitecture.cmake


Modified: trunk/CMake/ConfigArchitecture.cmake
==============================================================================
--- trunk/CMake/ConfigArchitecture.cmake        (original)
+++ trunk/CMake/ConfigArchitecture.cmake        Mon Jan  7 17:22:11 2008
@@ -11,6 +11,8 @@
 
 IF (APPLE)
 
+  MESSAGE("Inside Apple")
+
   # Obtain output of /usr/bin/macine
   EXEC_PROGRAM("/usr/bin/machine" OUTPUT_VARIABLE APPLE_MACHINE)
 
@@ -18,23 +20,23 @@
 
   COMPARE_VERSION_STRINGS(${APPLE_VERSION} "9.0.0" APPLE_LEOPARD_CMP)
   # Apple G4
-  IF (${APPLE_MACHINE} MATCHES "ppc7450")
+  IF (APPLE_MACHINE MATCHES "ppc7450")
     SET(APPLE_G4 TRUE)
-  ENDIF (${APPLE_MACHINE} MATCHES "ppc7450")
+  ENDIF (APPLE_MACHINE MATCHES "ppc7450")
 
   # Apple G5
-  IF (${APPLE_MACHINE} MATCHES "ppc970")
+  IF (APPLE_MACHINE MATCHES "ppc970")
     SET(APPLE_G5 TRUE)
-  ENDIF(${APPLE_MACHINE} MATCHES "ppc970")
+  ENDIF(APPLE_MACHINE MATCHES "ppc970")
 
   # Intel
-  IF (${APPLE_MACHINE} MATCHES "i486")
+  IF (APPLE_MACHINE MATCHES "i486")
     SET(APPLE_X86 TRUE)
-  ENDIF (${APPLE_MACHINE} MATCHES "i486")
+  ENDIF (APPLE_MACHINE MATCHES "i486")
 
-  IF (${APPLE_LEOPARD_CMP} GREATER -1)
+  IF (APPLE_LEOPARD_CMP GREATER -1)
     SET(APPLE_LEOPARD TRUE)
-  ENDIF(${APPLE_LEOPARD_CMP} GREATER -1)
+  ENDIF(APPLE_LEOPARD_CMP GREATER -1)
     
 #   MESSAGE("APPLE_G4  = ${APPLE_G4}")
 #   MESSAGE("APPLE_G5  = ${APPLE_G5}")

---

• [Manta] r1976 - trunk/CMake, abe, 01/07/2008

---

Archive powered by MHonArc 2.6.16.