diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-06 22:33:26 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-06 22:33:26 (GMT) |
| commit | a636637b2cc2c3232112fd9c12fb9002068b9ddb (patch) | |
| tree | 3ca70ff2c209403557a993168c53fe7175311870 /abs/core/cmake/fix-pkg-config.patch | |
| parent | 760fe45316486bf525f49f6dccd9b22192720f0b (diff) | |
| download | linhes_pkgbuild-a636637b2cc2c3232112fd9c12fb9002068b9ddb.zip linhes_pkgbuild-a636637b2cc2c3232112fd9c12fb9002068b9ddb.tar.gz linhes_pkgbuild-a636637b2cc2c3232112fd9c12fb9002068b9ddb.tar.bz2 | |
cmake 2.8.8
Diffstat (limited to 'abs/core/cmake/fix-pkg-config.patch')
| -rw-r--r-- | abs/core/cmake/fix-pkg-config.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/abs/core/cmake/fix-pkg-config.patch b/abs/core/cmake/fix-pkg-config.patch new file mode 100644 index 0000000..c9390ae --- /dev/null +++ b/abs/core/cmake/fix-pkg-config.patch @@ -0,0 +1,31 @@ +X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=blobdiff_plain;f=Modules%2FFindPkgConfig.cmake;h=39d3a76abd852df4a32eab5f8d5672fa24a7e4cf;hp=5d93ab151de792b4565cbef1927f372be633f4a6;hb=3ea850a5023060b84dcc0e6f0098c32c28b15807;hpb=ad3d2b450f1c2454cd1a3f416ef97631e2937eef + +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 "") |