summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-12-14 17:51:43 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-12-14 17:51:43 (GMT)
commita488c2646caadb315b5fbab69b6f49246ba5d5a2 (patch)
treef2516acf50e40adb11b6c0b3de9625c645eb135f
parent1f84c86e2160e764d4e485c5dfe4061f73f0afc7 (diff)
downloadCMake-a488c2646caadb315b5fbab69b6f49246ba5d5a2.zip
CMake-a488c2646caadb315b5fbab69b6f49246ba5d5a2.tar.gz
CMake-a488c2646caadb315b5fbab69b6f49246ba5d5a2.tar.bz2
BUG: fix for 6117, fix for second run
-rw-r--r--Modules/FindPkgConfig.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 34ef039..43b02fd 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -328,7 +328,7 @@ endmacro(pkg_check_modules)
###
macro(pkg_search_module _prefix _module0)
# 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)
_pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
@@ -352,7 +352,7 @@ macro(pkg_search_module _prefix _module0)
endif(NOT ${_prefix}_FOUND)
_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)
### Local Variables: