Commit 3ea850a5 authored by Rolf Eike Beer's avatar Rolf Eike Beer
Browse files

FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)

The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
An additional hint to really get this fixed came from Rex Dieter.
parent ad3d2b45
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
# When the 'QUIET' argument is set, no status messages will be printed. # When the 'QUIET' argument is set, no status messages will be printed.
# #
# It sets the following variables: # It sets the following variables:
# PKG_CONFIG_FOUND ... true if pkg-config works on the system # PKG_CONFIG_FOUND ... if pkg-config executable was found
# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
# PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
# (since CMake 2.8.8) # (since CMake 2.8.8)
# PKG_CONFIG_FOUND ... if pkg-config executable was found
# #
# For the following variables two sets of values exist; first one is the # For the following variables two sets of values exist; first one is the
# common one and has the given PREFIX. The second set contains flags # common one and has the given PREFIX. The second set contains flags
...@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig ...@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
REQUIRED_VARS PKG_CONFIG_EXECUTABLE REQUIRED_VARS PKG_CONFIG_EXECUTABLE
VERSION_VAR PKG_CONFIG_VERSION_STRING) VERSION_VAR PKG_CONFIG_VERSION_STRING)
# This is needed because the module name is "PkgConfig" but the name of
# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
# handled by FPHSA.
set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
# Unsets the given variables # Unsets the given variables
macro(_pkgconfig_unset var) macro(_pkgconfig_unset var)
set(${var} "" CACHE INTERNAL "") set(${var} "" CACHE INTERNAL "")
......
...@@ -71,7 +71,7 @@ endmacro(check_version_string) ...@@ -71,7 +71,7 @@ endmacro(check_version_string)
# reported. # reported.
foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB) JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
check_version_string(${VTEST} ${VTEST}_VERSION_STRING) check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach(VTEST) endforeach(VTEST)
...@@ -82,4 +82,3 @@ endforeach(VTEST) ...@@ -82,4 +82,3 @@ endforeach(VTEST)
check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
check_version_string(SUBVERSION Subversion_VERSION_SVN) check_version_string(SUBVERSION Subversion_VERSION_SVN)
check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
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