[Cmake-commits] CMake branch, next, updated. v2.8.6-1947-gbaf2b0f

[David Cole]

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  baf2b0f91863f8831fdea6ac4430088f680b31a8 (commit)
       via  20cb5edbcaaf89c35638911c27e6aec1c7fc022f (commit)
      from  2dbaad551aa9bb41b8a6e8f166a4ec1f4ee788e9 (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=baf2b0f91863f8831fdea6ac4430088f680b31a8
commit baf2b0f91863f8831fdea6ac4430088f680b31a8
Merge: 2dbaad5 20cb5ed
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 18 10:48:47 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 18 10:48:47 2011 -0500

    Merge topic 'FindBISON-version-regex' into next
    
    20cb5ed FindBISON: Fix matching output of "bison --version"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20cb5edbcaaf89c35638911c27e6aec1c7fc022f
commit 20cb5edbcaaf89c35638911c27e6aec1c7fc022f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Nov 18 16:14:54 2011 +0100
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 18 10:47:28 2011 -0500

    FindBISON: Fix matching output of "bison --version"
    
    The output may contain semicolons, which will confuse the IF() because of
    missing quoting.

diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index 25fd51d..edde9eb 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -68,11 +68,11 @@ IF(BISON_EXECUTABLE)
     MESSAGE(SEND_ERROR "Command \"${BISON_EXECUTABLE} --version\" failed with output:\n${BISON_version_error}")
   ELSE()
     # Bison++
-    IF(${BISON_version_output} MATCHES "^bison\\+\\+")
+    IF("${BISON_version_output}" MATCHES "^bison\\+\\+")
       STRING(REGEX REPLACE "^bison\\+\\+ Version ([^,]+).*" "\\1"
         BISON_VERSION "${BISON_version_output}")
     # GNU Bison
-    ELSEIF(${BISON_version_output} MATCHES "^bison[^+]")
+    ELSEIF("${BISON_version_output}" MATCHES "^bison[^+]")
       STRING(REGEX REPLACE "^bison \\(GNU Bison\\) ([^\n]+)\n.*" "\\1"
         BISON_VERSION "${BISON_version_output}")
     ELSE()

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

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


hooks/post-receive
-- 
CMake