[Cmake-commits] CMake branch, next, updated. v2.8.2-192-g8b72276

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  8b722761b272a6cc63ed2c2d90400d7a555e7ffd (commit)
       via  3ef273c568614e4790f8a7cf5b2521da2277cb4c (commit)
      from  0a250a1cc3c3607cc2ee828c4d955f0a1621dd6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b722761b272a6cc63ed2c2d90400d7a555e7ffd
commit 8b722761b272a6cc63ed2c2d90400d7a555e7ffd
Merge: 0a250a1 3ef273c
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jul 6 09:59:18 2010 -0400

    Merge branch 'disable_gcc33_onfree_bsd' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ef273c568614e4790f8a7cf5b2521da2277cb4c
commit 3ef273c568614e4790f8a7cf5b2521da2277cb4c
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jul 6 09:54:36 2010 -0400

    Poison GCC 3.3 on OpenBSD a bit later
    
    Move lines from commit 696a0af (Disable gcc 33 on OpenBSD because it
    crashes CPack by default, 2010-06-25) further down in CMakeLists.txt so
    that CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS applies.  This fixes the code for
    building with CMake 2.4.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b41cc3..cbce95a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,21 +17,6 @@ ENDIF(COMMAND CMAKE_POLICY)
 
 MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
 
-IF(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
-  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER}
-    ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-    OUTPUT_VARIABLE _GXX_VERSION
-  )
-  STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
-    _GXX_VERSION_SHORT ${_GXX_VERSION})
-  IF(_GXX_VERSION_SHORT EQUAL 33)
-    MESSAGE(FATAL_ERROR
-      "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n"
-      "Please use GXX 4.2 or greater to build CMake on OpenBSD\n"
-      "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}")
-  ENDIF()
-ENDIF()
-
 # Allow empty endif() and such with CMake 2.4.
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
 
@@ -345,7 +330,21 @@ MACRO (CMAKE_BUILD_UTILITIES)
   ENDIF(BUILD_CursesDialog)
 ENDMACRO (CMAKE_BUILD_UTILITIES)
 
-
+#-----------------------------------------------------------------------
+IF(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+  EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER}
+    ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+    OUTPUT_VARIABLE _GXX_VERSION
+  )
+  STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
+    _GXX_VERSION_SHORT ${_GXX_VERSION})
+  IF(_GXX_VERSION_SHORT EQUAL 33)
+    MESSAGE(FATAL_ERROR
+      "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n"
+      "Please use GXX 4.2 or greater to build CMake on OpenBSD\n"
+      "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}")
+  ENDIF()
+ENDIF()
 
 #-----------------------------------------------------------------------
 # The main section of the CMakeLists file

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake