diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-08-07 20:01:44 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2010-08-07 20:01:44 (GMT) |
| commit | cb9d1eaca463f0b11808e1faa1ae9587bda923af (patch) | |
| tree | b8ff02b008226a7949eec3853d3b4937ba346b09 /Modules | |
| parent | fd69b3310dc314d0a61e31775f4b6ecf6be2d596 (diff) | |
| download | CMake-cb9d1eaca463f0b11808e1faa1ae9587bda923af.zip CMake-cb9d1eaca463f0b11808e1faa1ae9587bda923af.tar.gz CMake-cb9d1eaca463f0b11808e1faa1ae9587bda923af.tar.bz2 | |
Add version checking support to FindFlex and FindPerlLibs
Use the new mode of FPHSA() to add version checking for these two modules.
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindFLEX.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindPerlLibs.cmake | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index 068ee75..1f289e0 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -6,6 +6,10 @@ # FLEX_VERSION - the version of flex # FLEX_LIBRARIES - The flex libraries # +# The minimum required version of flex can be specified using the +# standard syntax, e.g. FIND_PACKAGE(FLEX 2.5.13) +# +# # If flex is found on the system, the module provides the macro: # FLEX_TARGET(Name FlexInput FlexOutput [COMPILE_FLAGS <string>]) # which creates a custom command to generate the <FlexOutput> file from @@ -136,6 +140,7 @@ IF(FLEX_EXECUTABLE) ENDIF(FLEX_EXECUTABLE) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLEX DEFAULT_MSG FLEX_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLEX REQUIRED_VARS FLEX_EXECUTABLE + VERSION_VAR FLEX_VERSION) # FindFLEX.cmake ends here diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake index 422282f..13f3910 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake @@ -8,6 +8,9 @@ # PERL_LIBRARY = path to libperl # PERL_EXECUTABLE = full path to the perl binary # +# The minimum required version of Perl can be specified using the +# standard syntax, e.g. FIND_PACKAGE(PerlLibs 6.0) +# # The following variables are also available if needed # (introduced after CMake 2.6.4) # @@ -227,8 +230,9 @@ endif (PERL_EXECUTABLE) # handle the QUIETLY and REQUIRED arguments and set PERLLIBS_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(PerlLibs DEFAULT_MSG PERL_LIBRARY PERL_INCLUDE_PATH) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PerlLibs REQUIRED_VARS PERL_LIBRARY PERL_INCLUDE_PATH + VERSION_VAR PERL_VERSION) # Introduced after CMake 2.6.4 to bring module into compliance set(PERL_INCLUDE_DIR ${PERL_INCLUDE_PATH}) |