Commit b1e6b604 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

pkg_check_modules.cmake: Update the version to work around...

pkg_check_modules.cmake: Update the version to work around http://www.cmake.org/Bug/view.php?id=6117 as spotted by prahal.
parent fbf515ab
# From KDELibs - BSD Licence
# - a pkg-config module for CMake # - a pkg-config module for CMake
# #
# Usage: # Usage:
...@@ -23,10 +22,10 @@ ...@@ -23,10 +22,10 @@
# <XPREFIX>_LIBRARIES ... only the libraries (w/o the '-l') # <XPREFIX>_LIBRARIES ... only the libraries (w/o the '-l')
# <XPREFIX>_LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') # <XPREFIX>_LIBRARY_DIRS ... the paths of the libraries (w/o the '-L')
# <XPREFIX>_LDFLAGS ... all required linker flags # <XPREFIX>_LDFLAGS ... all required linker flags
# <XPREFIX>_LDFLAGS_OTHERS ... all other linker flags # <XPREFIX>_LDFLAGS_OTHER ... all other linker flags
# <XPREFIX>_INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') # <XPREFIX>_INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I')
# <XPREFIX>_CFLAGS ... all required cflags # <XPREFIX>_CFLAGS ... all required cflags
# <XPREFIX>_CFLAGS_OTHERS ... the other compiler flags # <XPREFIX>_CFLAGS_OTHER ... the other compiler flags
# #
# <XPREFIX> = <PREFIX> for common case # <XPREFIX> = <PREFIX> for common case
# <XPREFIX> = <PREFIX>_STATIC for static linking # <XPREFIX> = <PREFIX>_STATIC for static linking
...@@ -329,7 +328,7 @@ endmacro(pkg_check_modules) ...@@ -329,7 +328,7 @@ endmacro(pkg_check_modules)
### ###
macro(pkg_search_module _prefix _module0) macro(pkg_search_module _prefix _module0)
# check cached value # check cached value
if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
set(_pkg_modules_found 0) set(_pkg_modules_found 0)
_pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
...@@ -353,7 +352,7 @@ macro(pkg_search_module _prefix _module0) ...@@ -353,7 +352,7 @@ macro(pkg_search_module _prefix _module0)
endif(NOT ${_prefix}_FOUND) endif(NOT ${_prefix}_FOUND)
_pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
endmacro(pkg_search_module) endmacro(pkg_search_module)
### Local Variables: ### Local Variables:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment