[Cmake-commits] CMake branch, next, updated. v2.8.9-305-g3b45ec5

[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  3b45ec5f7ff0b9946d8846540a625f139046bc97 (commit)
       via  af06482d24799106dbf5a2cbd82d20d034df2b45 (commit)
       via  3e72df14845fff7830701a9fd8d587968ad43d4a (commit)
       via  d9db32e5bf7f006743e136631faf57116607b77c (commit)
       via  9f7e46f77f6b91033ec8e1e3ce5164f2c6523389 (commit)
      from  f152107cd906e9bbe484830e25658e4e833be895 (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=3b45ec5f7ff0b9946d8846540a625f139046bc97
commit 3b45ec5f7ff0b9946d8846540a625f139046bc97
Merge: f152107 af06482
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 30 09:34:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 30 09:34:57 2012 -0400

    Merge topic 'flex-version-apple' into next
    
    af06482 FindFLEX: fix version extraction on Apple
    3e72df1 CMake Nightly Date Stamp
    d9db32e CMake Nightly Date Stamp
    9f7e46f CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af06482d24799106dbf5a2cbd82d20d034df2b45
commit af06482d24799106dbf5a2cbd82d20d034df2b45
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 30 15:33:27 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Aug 30 15:34:41 2012 +0200

    FindFLEX: fix version extraction on Apple
    
    The space in 'flex 2.5.35 Apple(flex-31)' caused the version extraction to
    fail. Ignore everything after the first space following the version number.

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index e397d28..daae94f 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 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake