Changeset 6546

Timestamp:

04/25/07 11:07:40

Author:

robert

Message:

From Eric Wing, "I made a mistake in my IF() checks for FOO_CONFIG_HAS_BEEN_RUN_BEFORE.
I was using ${FOO_CONFIG_HAS_BEEN_RUN_BEFORE} instead of just
FOO_HAS_BEEN_RUN_BEFORE.

In this case, it happened to work out to still be correct, but in
general it shouldn't have the ${}. (I really hate this syntax.)"

Files:

• OpenThreads/trunk/CMakeLists.txt (modified) (4 diffs)

OpenThreads/trunk/CMakeLists.txt

@@ -197 +197 @@
-    # will overwrite any changes the user sets.
-    # FORCE is used because the options are not reflected in the UI otherwise.
-"${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}"
+OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE
-        # This is really fragile, but CMake doesn't provide the OS system 
-        # version information we need. (Darwin versions can be changed 
@@ -207 +207 @@
-        ELSE(EXISTS /Developer/SDKs/10.5.sdk)
-            IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+                # Unix layer on Tiger is 64-bit clean/ready so I think 
+                # it is okay to build 64-bit here. This presumes we 
+                # keep non-64-bit ready APIs (e.g. Carbon) out
+                # of OpenThreads.
-                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
-                #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
@@ -214 +218 @@
-            ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-        ENDIF(EXISTS /Developer/SDKs/10.5.sdk)
-"${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}"
+OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE
-ENDIF(APPLE)
-
@@ -250 +254 @@
-# This needs to be run very last so other parts of the scripts can take
-# advantage of this.
-"${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}"
+OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE
-    SET(OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
-"${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}"
-
-
+OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE
+
+