Changeset 6476

Timestamp:

04/11/07 10:35:58

Author:

robert

Message:

From Eric Wing:
"
Changes include:

A internal cache flag that can be used to detect if this is the first
time running the CMake configuration. This is needed to work around
stupid CMake UI shortcomings about the UI not reflecting anything you
SET unless you use FORCE. But if you use FORCE, you override anything
the user may try to set/override unless you have an exception check.
It turns out the exception check you need is often the first-run
check. This flag is potentially useful for other things too.

An optional switch that turns on more aggressive warnings based on
your compiler.

Some Apple specific stuff for detecting the OS version and enabling
Universal Binaries (and some additional compiler flags that are good
but gcc version dependent). The version check code is unfortunately
really fragile. I need to lobby CMake to return the OS X version
number for us. FYI, building Universal will fail with the current
CMake release due to a bug, but is now fixed in CVS.

"

Files:

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

OpenThreads/trunk/CMakeLists.txt

@@ -124 +124 @@
-   FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin ${CMAKE_BINARY_DIR}/lib)
-ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+
+
+
+
+###############################################################################
+# This is for an advanced option to give aggressive warnings 
+# under different compilers. If yours is not implemented, this option
+# will not be made available.
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # To be complete, we might also do GNUCC flags, 
+    # but everything here is C++ code.
+    # # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another 
+    # interesting C-specific flag.
+    SET(OPENTHREADS_AGGRESSIVE_WARNING_FLAGS "-Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wnewline-eof -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -Wshadow -Woverloaded-virtual")
+ELSE(CMAKE_COMPILER_IS_GNUCXX)
+    IF(MSVC)
+        # FIXME: What are good aggressive warning flags for Visual Studio?
+        # And do we need to further subcase this for different versions of VS?
+        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
+        SET(OPENTHREADS_AGGRESSIVE_WARNING_FLAGS "/Wall /W4")
+    ELSE(MSVC)
+        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
+        # to be listed below. If unhandled, OPENTHREADS_AGGRESSIVE_WARNING_FLAGS should 
+        # remain unset.
+    ENDIF(MSVC)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+# This part is for the CMake menu option to toggle the warnings on/off.
+# This will only be made available if we set values for OPENTHREADS_AGGRESSIVE_WARNING_FLAGS.
+IF(OPENTHREADS_AGGRESSIVE_WARNING_FLAGS)
+    OPTION(OPENTHREADS_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" OFF)
+    MARK_AS_ADVANCED(OPENTHREADS_USE_AGGRESSIVE_WARNINGS)
+
+    IF(OPENTHREADS_USE_AGGRESSIVE_WARNINGS)
+        IF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+            SET(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "Old CXX flags")
+            SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 1 CACHE INTERNAL "Old CXX flags was set")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENTHREADS_AGGRESSIVE_WARNING_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+        ENDIF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+    ELSE(OPENTHREADS_USE_AGGRESSIVE_WARNINGS)
+        # FIXME: This will lose any changes made after OLD_CMAKE_CXX_FLAGS was 
+        # set. The better way would be to parse the string and remove each
+        # option explicitly.
+        IF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+            SET(CMAKE_CXX_FLAGS "${OLD_CMAKE_CXX_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 0 CACHE INTERNAL "Old CXX flags was set")
+        ENDIF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+    ENDIF(OPENTHREADS_USE_AGGRESSIVE_WARNINGS)
+ENDIF(OPENTHREADS_AGGRESSIVE_WARNING_FLAGS)
+
+
+###############################################################################
+# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 
+# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
+IF(APPLE)
+    # These are just defaults/recommendations, but how we want to build
+    # out of the box. But the user needs to be able to change these options.
+    # So we must only set the values the first time CMake is run, or we 
+    # will overwrite any changes the user sets.
+    # FORCE is used because the options are not reflected in the UI otherwise.
+    IF(NOT "${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 
+        # independently of OS X versions.)
+        # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
+        IF(EXISTS /Developer/SDKs/10.5.sdk)
+            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+        ELSE(EXISTS /Developer/SDKs/10.5.sdk)
+            IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+                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)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSE(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+                # No Universal Binary support
+            ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
+        ENDIF(EXISTS /Developer/SDKs/10.5.sdk)
+    ENDIF(NOT "${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}")
+ENDIF(APPLE)
+
-
-
@@ -154 +234 @@
-ENDIF(BUILD_DOCUMENTATION)
-
+
+# This needs to be run very last so other parts of the scripts can take
+# advantage of this.
+IF(NOT "${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")
+ENDIF(NOT "${OPENTHREADS_CONFIG_HAS_BEEN_RUN_BEFORE}")
+
+