From 364b72ed39705614bc995767d183af2b23b5e885 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Fri, 6 Oct 2006 20:00:57 +0000 Subject: For other modules that might require flex. For example kdesdk (kbabel) svn path=/trunk/KDE/kdelibs/; revision=593108 --- modules/FindFlex.cmake | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/FindFlex.cmake (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake new file mode 100644 index 00000000..59831ffd --- /dev/null +++ b/modules/FindFlex.cmake @@ -0,0 +1,32 @@ +# - Try to find Flex +# Once done this will define +# +# FLEX_FOUND - system has Flex +# FLEX_EXECUTABLE - path of the flex executable +# FLEX_VERSION - the version string, like "2.5.31" +# + + +FIND_PROGRAM(FLEX_EXECUTABLE NAMES flex) + +INCLUDE(MacroEnsureVersion) + +IF(FLEX_EXECUTABLE) + SET(FLEX_FOUND TRUE) + + EXECUTE_PROCESS(COMMAND ${FLEX_EXECUTABLE} --version + OUTPUT_VARIABLE _FLEX_VERSION + ) + string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" FLEX_VERSION "${_FLEX_VERSION}") +ENDIF(FLEX_EXECUTABLE) + +IF(FLEX_FOUND) + IF(NOT Flex_FIND_QUIETLY) + MESSAGE(STATUS "Found Flex: ${FLEX_EXECUTABLE}") + ENDIF(NOT Flex_FIND_QUIETLY) +ELSE(FLEX_FOUND) + IF(Flex_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Flex") + ENDIF(Flex_FIND_REQUIRED) +ENDIF(FLEX_FOUND) + -- cgit v1.2.1 From dd65b2890447e9c4cd6994bb9f60fd5f255a2dc3 Mon Sep 17 00:00:00 2001 From: Jakob Petsovits Date: Thu, 29 Mar 2007 16:48:15 +0000 Subject: Merge changes from KDevelop's copy of FindFlex.cmake, as preparation for getting rid of it. svn path=/trunk/KDE/kdelibs/; revision=647835 --- modules/FindFlex.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 59831ffd..4a22ed6f 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -20,9 +20,12 @@ IF(FLEX_EXECUTABLE) string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" FLEX_VERSION "${_FLEX_VERSION}") ENDIF(FLEX_EXECUTABLE) +FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h) +FIND_LIBRARY(FLEX_LIBRARY fl) + IF(FLEX_FOUND) IF(NOT Flex_FIND_QUIETLY) - MESSAGE(STATUS "Found Flex: ${FLEX_EXECUTABLE}") + MESSAGE(STATUS "Found Flex: ${FLEX_EXECUTABLE} ${FLEX_VERSION}") ENDIF(NOT Flex_FIND_QUIETLY) ELSE(FLEX_FOUND) IF(Flex_FIND_REQUIRED) -- cgit v1.2.1 From 28ffbf35cdb40d8fb48800fb15083192c5a5ea41 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Thu, 5 Apr 2007 21:21:03 +0000 Subject: Search in /usr/include and /usr/local/include for FlexLexer.h svn path=/trunk/KDE/kdelibs/; revision=650937 --- modules/FindFlex.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 4a22ed6f..afc5f8a1 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -20,7 +20,10 @@ IF(FLEX_EXECUTABLE) string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" FLEX_VERSION "${_FLEX_VERSION}") ENDIF(FLEX_EXECUTABLE) -FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h) +FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h + /usr/include + /usr/local/include + ) FIND_LIBRARY(FLEX_LIBRARY fl) IF(FLEX_FOUND) -- cgit v1.2.1 From 2894ae45d770d85eea88100a9b7a23565fa3aec7 Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Mon, 9 Apr 2007 12:42:55 +0000 Subject: Revert my last change, the two directories are searched by default svn path=/trunk/KDE/kdelibs/; revision=651810 --- modules/FindFlex.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index afc5f8a1..631dcd27 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -20,10 +20,7 @@ IF(FLEX_EXECUTABLE) string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" FLEX_VERSION "${_FLEX_VERSION}") ENDIF(FLEX_EXECUTABLE) -FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h - /usr/include - /usr/local/include - ) +FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h ) FIND_LIBRARY(FLEX_LIBRARY fl) IF(FLEX_FOUND) -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindFlex.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 631dcd27..01f909c0 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -4,7 +4,6 @@ # FLEX_FOUND - system has Flex # FLEX_EXECUTABLE - path of the flex executable # FLEX_VERSION - the version string, like "2.5.31" -# FIND_PROGRAM(FLEX_EXECUTABLE NAMES flex) -- cgit v1.2.1 From 5dee5a83bd51420f74a5723583b9c194077397bd Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 19:02:54 +0000 Subject: -mark variables as advanced and add simple test Alex svn path=/trunk/KDE/kdelibs/; revision=884365 --- modules/FindFlex.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 01f909c0..4a2034eb 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -32,3 +32,4 @@ ELSE(FLEX_FOUND) ENDIF(Flex_FIND_REQUIRED) ENDIF(FLEX_FOUND) +MARK_AS_ADVANCED(FLEX_INCLUDE_DIR FLEX_LIBRARY FLEX_EXECUTABLE) \ No newline at end of file -- cgit v1.2.1 From edbb4a8a70a894c46be88fa9cb7ef38a6032fcc1 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 14 Nov 2008 19:55:04 +0000 Subject: add eol at eof Alex svn path=/trunk/KDE/kdelibs/; revision=884376 --- modules/FindFlex.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index 4a2034eb..c69cffd0 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -32,4 +32,4 @@ ELSE(FLEX_FOUND) ENDIF(Flex_FIND_REQUIRED) ENDIF(FLEX_FOUND) -MARK_AS_ADVANCED(FLEX_INCLUDE_DIR FLEX_LIBRARY FLEX_EXECUTABLE) \ No newline at end of file +MARK_AS_ADVANCED(FLEX_INCLUDE_DIR FLEX_LIBRARY FLEX_EXECUTABLE) -- cgit v1.2.1 From 87c903a8e853eec433860818a01040da8d1c5f1a Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 4 Jan 2009 15:39:53 +0000 Subject: -add missing copyright notices, I hope I got it right -also a few empty lines here and there to make it look nicer Alex svn path=/trunk/KDE/kdelibs/; revision=905547 --- modules/FindFlex.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index c69cffd0..a2db9864 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -6,6 +6,11 @@ # FLEX_VERSION - the version string, like "2.5.31" +# Copyright (c) 2008, Jakob Petsovits, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + FIND_PROGRAM(FLEX_EXECUTABLE NAMES flex) INCLUDE(MacroEnsureVersion) -- cgit v1.2.1 From 067428213344ff1067839e2e180848c1699c299d Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Sep 2010 11:14:51 +0000 Subject: -improved version checking using the new mode of find_package_handle_standard_args() Alex svn path=/trunk/KDE/kdelibs/; revision=1179877 --- modules/FindFlex.cmake | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'modules/FindFlex.cmake') diff --git a/modules/FindFlex.cmake b/modules/FindFlex.cmake index a2db9864..6e54c5c4 100644 --- a/modules/FindFlex.cmake +++ b/modules/FindFlex.cmake @@ -4,6 +4,9 @@ # FLEX_FOUND - system has Flex # FLEX_EXECUTABLE - path of the flex executable # FLEX_VERSION - the version string, like "2.5.31" +# +# The minimum required version of Flex can be specified using the +# standard syntax, e.g. find_package(Flex 2.5) # Copyright (c) 2008, Jakob Petsovits, @@ -12,29 +15,21 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. FIND_PROGRAM(FLEX_EXECUTABLE NAMES flex) +FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h ) +FIND_LIBRARY(FLEX_LIBRARY fl) -INCLUDE(MacroEnsureVersion) - -IF(FLEX_EXECUTABLE) - SET(FLEX_FOUND TRUE) +IF(FLEX_EXECUTABLE AND NOT FLEX_VERSION) EXECUTE_PROCESS(COMMAND ${FLEX_EXECUTABLE} --version - OUTPUT_VARIABLE _FLEX_VERSION + OUTPUT_VARIABLE _FLEX_VERSION_OUTPUT ) - string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" FLEX_VERSION "${_FLEX_VERSION}") -ENDIF(FLEX_EXECUTABLE) + STRING (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _FLEX_VERSION "${_FLEX_VERSION_OUTPUT}") + SET(FLEX_VERSION "${_FLEX_VERSION}" CACHE STRING "Version number of Flex" FORCE) +ENDIF(FLEX_EXECUTABLE AND NOT FLEX_VERSION) -FIND_PATH(FLEX_INCLUDE_DIR FlexLexer.h ) -FIND_LIBRARY(FLEX_LIBRARY fl) -IF(FLEX_FOUND) - IF(NOT Flex_FIND_QUIETLY) - MESSAGE(STATUS "Found Flex: ${FLEX_EXECUTABLE} ${FLEX_VERSION}") - ENDIF(NOT Flex_FIND_QUIETLY) -ELSE(FLEX_FOUND) - IF(Flex_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Flex") - ENDIF(Flex_FIND_REQUIRED) -ENDIF(FLEX_FOUND) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Flex REQUIRED_VARS FLEX_EXECUTABLE + VERSION_VAR FLEX_VERSION ) MARK_AS_ADVANCED(FLEX_INCLUDE_DIR FLEX_LIBRARY FLEX_EXECUTABLE) -- cgit v1.2.1