summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-09-20 18:42:16 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-09-20 18:42:16 (GMT)
commitf628f12799fcecf16b8095524f5bbbabc3bec5d7 (patch)
tree46a471f160557588684312f093f5939c150751cb
parent0f98a0a08102fe58be05fee6080ce736060d89b8 (diff)
parentae331e1864201882cbf0484b8b3ed934791ec6df (diff)
downloadCMake-f628f12799fcecf16b8095524f5bbbabc3bec5d7.zip
CMake-f628f12799fcecf16b8095524f5bbbabc3bec5d7.tar.gz
CMake-f628f12799fcecf16b8095524f5bbbabc3bec5d7.tar.bz2
Merge topic 'CheckForFlexHeader'
ae331e1 FindFLEX.cmake: also search the include dir
-rw-r--r--Modules/FindFLEX.cmake11
1 files changed, 9 insertions, 2 deletions
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)