[Cmake-commits] CMake branch, next, updated. v2.8.5-1909-g1a0f4aa

[Alexander Neundorf]

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  1a0f4aa9e9c7edf8880240c6a7654ea07a6c77dc (commit)
       via  ae331e1864201882cbf0484b8b3ed934791ec6df (commit)
       via  962a54db5f92f66b3821dd110cd3200d483622bd (commit)
      from  6ab7fa01caf8b8181aa924ee119735c1451123a5 (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=1a0f4aa9e9c7edf8880240c6a7654ea07a6c77dc
commit 1a0f4aa9e9c7edf8880240c6a7654ea07a6c77dc
Merge: 6ab7fa0 ae331e1
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Sep 17 08:23:11 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 17 08:23:11 2011 -0400

    Merge topic 'CheckForFlexHeader' into next
    
    ae331e1 FindFLEX.cmake: also search the include dir
    962a54d KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae331e1864201882cbf0484b8b3ed934791ec6df
commit ae331e1864201882cbf0484b8b3ed934791ec6df
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Sep 17 14:27:24 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Sep 17 14:27:24 2011 +0200

    FindFLEX.cmake: also search the include dir
    
    FindFLEX.cmake already searched for the library, but
    not for the include dir. Do that too.
    
    Alex

diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake
index 3cc3da5..6a70b40 100644
--- a/Modules/FindFLEX.cmake
+++ b/Modules/FindFLEX.cmake
@@ -5,6 +5,7 @@
 #  FLEX_EXECUTABLE - the path to the flex executable
 #  FLEX_VERSION - the version of flex
 #  FLEX_LIBRARIES - The flex libraries
+#  FLEX_INCLUDE_DIRS - The path to the flex headers
 #
 # The minimum required version of flex can be specified using the
 # standard syntax, e.g. FIND_PACKAGE(FLEX 2.5.13)
@@ -66,8 +67,14 @@ FIND_PROGRAM(FLEX_EXECUTABLE flex DOC "path to the flex executable")
 MARK_AS_ADVANCED(FLEX_EXECUTABLE)
 
 FIND_LIBRARY(FL_LIBRARY NAMES fl
-  DOC "path to the fl library")
-MARK_AS_ADVANCED(FL_LIBRARY)
+  DOC "Path to the fl library")
+
+FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h
+  DOC "Path to the flex headers")
+
+MARK_AS_ADVANCED(FL_LIBRARY FLEX_INCLUDE_DIR)
+
+SET(FLEX_INCLUDE_DIRS ${FLEX_INCLUDE_DIR})
 SET(FLEX_LIBRARIES ${FL_LIBRARY})
 
 IF(FLEX_EXECUTABLE)

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

Summary of changes:
 Modules/FindFLEX.cmake            |   11 +++++++++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake