[Cmake-commits] CMake branch, next, updated. v2.8.7-2313-g32fdc83

[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  32fdc83d1861a7ea2fb1997ce9d132a7f6a7bc15 (commit)
       via  edb054409878fbc05d7c485defc9d65ebe8a42a9 (commit)
      from  7f0a67de4d4645d0d7dbc12889fbefda354385f7 (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=32fdc83d1861a7ea2fb1997ce9d132a7f6a7bc15
commit 32fdc83d1861a7ea2fb1997ce9d132a7f6a7bc15
Merge: 7f0a67d edb0544
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 27 14:17:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 27 14:17:56 2012 -0500

    Merge topic 'more-bison-version' into next
    
    edb0544 FindBISON: make regex work


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

    FindBISON: make regex work

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

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

Summary of changes:
 Modules/FindBISON.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake