[Cmake-commits] CMake branch, next, updated. v2.8.7-2317-g2961365

[Rolf Eike Beer]

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  29613651b6af61951ca6f91865618e08fba3d266 (commit)
       via  3cc11c2f420ef7d30d96e238b24646d8c024641e (commit)
      from  d03b554719ba04e8bc0465baf605ef92aded7084 (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=29613651b6af61951ca6f91865618e08fba3d266
commit 29613651b6af61951ca6f91865618e08fba3d266
Merge: d03b554 3cc11c2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 14:43:24 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 14:43:24 2012 -0500

    Merge topic 'more-bison-version' into next
    
    3cc11c2 FindBISON: add a version expression for GNU Bison 1.x


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cc11c2f420ef7d30d96e238b24646d8c024641e
commit 3cc11c2f420ef7d30d96e238b24646d8c024641e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 17:26:57 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 27 20:40:55 2012 +0100

    FindBISON: add a version expression for GNU Bison 1.x

diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index edde9eb..7af3367 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -75,8 +75,9 @@ IF(BISON_EXECUTABLE)
     ELSEIF("${BISON_version_output}" MATCHES "^bison[^+]")
       STRING(REGEX REPLACE "^bison \\(GNU Bison\\) ([^\n]+)\n.*" "\\1"
         BISON_VERSION "${BISON_version_output}")
-    ELSE()
-      SET(BISON_VERSION "unknown")
+    ELSEIF("${BISON_version_output}" MATCHES "^GNU Bison ")
+      STRING(REGEX REPLACE "^GNU Bison (version )?([^\n]+).*" "\\2"
+        BISON_VERSION "${BISON_version_output}")
     ENDIF()
   ENDIF()
 

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

Summary of changes:


hooks/post-receive
-- 
CMake