[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1065-g59fdf40

[Brad King]

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  59fdf4014f34c496726e97c8cbda1363813b6834 (commit)
       via  df293368933ce5698f62a359e3f2d244a60c33be (commit)
       via  e593f8a1cf8d8f757e6630148a37dc77cdf8eaf1 (commit)
      from  018e5e44547f0380e5bada482b1656923e667c0b (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=59fdf4014f34c496726e97c8cbda1363813b6834
commit 59fdf4014f34c496726e97c8cbda1363813b6834
Merge: 018e5e4 df29336
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 16:33:28 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 16:33:28 2012 -0500

    Merge topic 'winflexbison' into next
    
    df29336 FindFLEX: Add support for the Win flex-bison distribution
    e593f8a FindBISON: Add support for the Win flex-bison distribution


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df293368933ce5698f62a359e3f2d244a60c33be
commit df293368933ce5698f62a359e3f2d244a60c33be
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Mon Nov 26 22:22:39 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 16:30:05 2012 -0500

    FindFLEX: Add support for the Win flex-bison distribution
    
    Search for win_flex too and improve version parsing.

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index daae94f..79a3a1e 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -63,7 +63,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_program(FLEX_EXECUTABLE flex DOC "path to the flex executable")
+find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC "path to the flex executable")
 mark_as_advanced(FLEX_EXECUTABLE)
 
 find_library(FL_LIBRARY NAMES fl
@@ -93,10 +93,12 @@ if(FLEX_EXECUTABLE)
   else()
     # 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"
+    get_filename_component(FLEX_EXE_NAME_WE "${FLEX_EXECUTABLE}" NAME_WE)
+    get_filename_component(FLEX_EXE_EXT "${FLEX_EXECUTABLE}" EXT)
+    string(REGEX REPLACE "^.*${FLEX_EXE_NAME_WE}(${FLEX_EXE_EXT})?\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\3"
       FLEX_VERSION "${FLEX_version_output}")
-    unset(FLEX_EXE_NAME)
+    unset(FLEX_EXE_EXT)
+    unset(FLEX_EXE_NAME_WE)
   endif()
 
   #============================================================

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e593f8a1cf8d8f757e6630148a37dc77cdf8eaf1
commit e593f8a1cf8d8f757e6630148a37dc77cdf8eaf1
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Mon Nov 26 20:46:36 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 16:29:38 2012 -0500

    FindBISON: Add support for the Win flex-bison distribution
    
    Search for win_bison too.

diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake
index a0afd34..4a3e68c 100644
--- a/Modules/FindBISON.cmake
+++ b/Modules/FindBISON.cmake
@@ -47,7 +47,7 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-find_program(BISON_EXECUTABLE bison DOC "path to the bison executable")
+find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable")
 mark_as_advanced(BISON_EXECUTABLE)
 
 if(BISON_EXECUTABLE)

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

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


hooks/post-receive
-- 
CMake