[Cmake-commits] CMake branch, next, updated. v2.8.7-2303-g94620fd

[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  94620fd608bfd43eefca720deddb7725e5c8e47b (commit)
       via  d0d9ebe5fe37b5543b5775adc0776cf975aaf07d (commit)
       via  2184cc6469c9c2803ef73c4e677e0658cf42e8cd (commit)
      from  18cc0859794f4aed0761193c756c89d8a0683518 (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=94620fd608bfd43eefca720deddb7725e5c8e47b
commit 94620fd608bfd43eefca720deddb7725e5c8e47b
Merge: 18cc085 d0d9ebe
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 11:55:39 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 11:55:39 2012 -0500

    Merge topic 'more-bison-version' into next
    
    d0d9ebe FindBISON: add a version expression for GNU Bison 1.x
    2184cc6 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0d9ebe5fe37b5543b5775adc0776cf975aaf07d
commit d0d9ebe5fe37b5543b5775adc0776cf975aaf07d
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 17:28:46 2012 +0100

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

diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index edde9eb..3925071 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]+)\n.*" "\\2"
+        BISON_VERSION "${BISON_version_output}")
     ENDIF()
   ENDIF()
 

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

Summary of changes:
 Modules/FindBISON.cmake           |    5 +++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake