[Cmake-commits] CMake branch, next, updated. v2.8.7-2210-g42dd02e

[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  42dd02e12064aa642ce83aa02c3c0d8a0cd4424b (commit)
       via  0b2e81c63ce6ca9dcf9d775d3f5cd22749e8c134 (commit)
      from  a6810c3c5cb8e0a83bac551c36b5312909f48a8b (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=42dd02e12064aa642ce83aa02c3c0d8a0cd4424b
commit 42dd02e12064aa642ce83aa02c3c0d8a0cd4424b
Merge: a6810c3 0b2e81c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 17:40:42 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 17:40:42 2012 -0500

    Merge topic 'flex-version' into next
    
    0b2e81c FindFLEX: fix version parsing when the executable is quoted


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

    FindFLEX: fix version parsing when the executable is quoted

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 6309bc9..586f77a 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -94,7 +94,7 @@ IF(FLEX_EXECUTABLE)
     # older versions of flex printed "/full/path/to/executable version X.Y"
     # newer versions use "basename(executable) X.Y"
     GET_FILENAME_COMPONENT(FLEX_EXE_NAME "${FLEX_EXECUTABLE}" NAME)
-    STRING(REGEX REPLACE "^.*${FLEX_EXE_NAME} (version )?([0-9]+[^ ]*)$" "\\2"
+    STRING(REGEX REPLACE "^.*${FLEX_EXE_NAME}\"? (version )?([0-9]+[^ ]*)$" "\\2"
       FLEX_VERSION "${FLEX_version_output}")
     UNSET(FLEX_EXE_NAME)
   ENDIF()

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

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


hooks/post-receive
-- 
CMake