diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2012-11-14 15:28:34 +0100 |
|---|---|---|
| committer | Jose V Beneyto <sepen@crux.nu> | 2012-11-14 15:28:34 +0100 |
| commit | 3effe9387dfdeb4a33e4d10e4d024b76d4b2eae7 (patch) | |
| tree | 1c23227ece0afef29ef30fe85fd7b08e8ed1ded3 /cmake | |
| parent | b335ece37873d41e522c05d19e81a8e90f97c07a (diff) | |
| download | opt-3effe9387dfdeb4a33e4d10e4d024b76d4b2eae7.tar.gz opt-3effe9387dfdeb4a33e4d10e4d024b76d4b2eae7.tar.xz | |
gnutls: updated to 3.1.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/fix-pkg-config.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/cmake/fix-pkg-config.patch b/cmake/fix-pkg-config.patch deleted file mode 100644 index aba3a6f9e..000000000 --- a/cmake/fix-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 "") |