diff options
Diffstat (limited to 'source/d/cmake/cmake.findpkgconfig.3ea850.patch')
| -rw-r--r-- | source/d/cmake/cmake.findpkgconfig.3ea850.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/source/d/cmake/cmake.findpkgconfig.3ea850.patch b/source/d/cmake/cmake.findpkgconfig.3ea850.patch new file mode 100644 index 000000000..a64e47a72 --- /dev/null +++ b/source/d/cmake/cmake.findpkgconfig.3ea850.patch @@ -0,0 +1,63 @@ +From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Fri, 13 Apr 2012 08:50:49 +0200 +Subject: [PATCH] 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. +--- + Modules/FindPkgConfig.cmake | 8 ++++++-- + Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 +-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index 5d93ab1..39d3a76 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -13,11 +13,10 @@ + # When the 'QUIET' argument is set, no status messages will be printed. + # + # 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_VERSION_STRING ... the version of the pkg-config program found + # (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 + # common one and has the given PREFIX. The second set contains flags +@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig + REQUIRED_VARS PKG_CONFIG_EXECUTABLE + 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 + macro(_pkgconfig_unset var) + set(${var} "" CACHE INTERNAL "") +diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +index 6604208..fc65e58 100644 +--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt ++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +@@ -71,7 +71,7 @@ endmacro(check_version_string) + # reported. + + 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) + endforeach(VTEST) + +@@ -82,4 +82,3 @@ endforeach(VTEST) + + check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) + check_version_string(SUBVERSION Subversion_VERSION_SVN) +-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING) +-- +1.7.10 + |