View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

FindPKgConfig_checkifprefixfoundbeforereadingcache.diff [^] (1,038 bytes) 2007-12-04 07:10 [Show Content] [Hide Content]

--- FindPkgConfig.cmake.orig	2007-12-04 13:05:29.000000000 +0100
+++ FindPkgConfig.cmake	2007-12-04 13:05:16.000000000 +0100
@@ -328,7 +328,7 @@
 ###
 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 @@
     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:

FindPkgConfig_preventcachenotfound2.cmake.diff [^] (1,013 bytes) 2008-02-04 10:49 [Show Content] [Hide Content]

--- FindPkgConfig.cmake.orig	2008-02-04 16:44:06.000000000 +0100
+++ FindPkgConfig.cmake	2008-02-04 16:46:44.000000000 +0100
@@ -317,12 +317,12 @@
 ###
 macro(pkg_check_modules _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)
     _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
     _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
 
     _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_check_modules)
 
 ###

Relationships

Notes
(0010379) Alban Browaeys (reporter) 2008-02-04 10:48	the issue also apply to pkg_check_module : patch attached

(0010424) Bill Hoffman (manager) 2008-02-07 13:20	$ cvs commit -m "BUG: fix for bug 6117 pkgconfig" FindPkgConfig.cmake /cvsroot/CMake/CMake/Modules/FindPkgConfig.cmake,v <-- FindPkgConfig.cmake new revision: 1.7; previous revision: 1.6 Fixed in CVS, should be in 2.6.

Issue History
Date Modified	Username	Field	Change
2007-12-04 07:10	Alban Browaeys	New Issue
2007-12-04 07:10	Alban Browaeys	File Added: FindPKgConfig_checkifprefixfoundbeforereadingcache.diff
2007-12-14 12:56	Bill Hoffman	Status	new => closed
2007-12-14 12:56	Bill Hoffman	Resolution	open => fixed
2007-12-14 12:56	Bill Hoffman	Additional Information Updated
2008-02-04 10:48	Alban Browaeys	Status	closed => feedback
2008-02-04 10:48	Alban Browaeys	Resolution	fixed => reopened
2008-02-04 10:48	Alban Browaeys	Note Added: 0010379
2008-02-04 10:49	Alban Browaeys	File Added: FindPkgConfig_preventcachenotfound2.cmake.diff
2008-02-07 13:20	Bill Hoffman	Status	feedback => closed
2008-02-07 13:20	Bill Hoffman	Note Added: 0010424
2008-02-07 13:20	Bill Hoffman	Resolution	reopened => fixed