/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (hide annotations) (download)
Mon Oct 1 11:28:38 2012 UTC (5 years, 9 months ago) by johu
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Remove old.

(Portage version: 2.2.0_alpha133/cvs/Linux x86_64)

1 dilfridge 1.1 From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001
2     From: Rolf Eike Beer <eike@sf-mail.de>
3     Date: Fri, 13 Apr 2012 08:50:49 +0200
4     Subject: [PATCH] FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
5    
6     The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
7     An additional hint to really get this fixed came from Rex Dieter.
8     ---
9     Modules/FindPkgConfig.cmake | 8 ++++++--
10     Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 3 +--
11     2 files changed, 7 insertions(+), 4 deletions(-)
12    
13     diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
14     index 5d93ab1..39d3a76 100644
15     --- a/Modules/FindPkgConfig.cmake
16     +++ b/Modules/FindPkgConfig.cmake
17     @@ -13,11 +13,10 @@
18     # When the 'QUIET' argument is set, no status messages will be printed.
19     #
20     # It sets the following variables:
21     -# PKG_CONFIG_FOUND ... true if pkg-config works on the system
22     +# PKG_CONFIG_FOUND ... if pkg-config executable was found
23     # PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
24     # PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
25     # (since CMake 2.8.8)
26     -# PKG_CONFIG_FOUND ... if pkg-config executable was found
27     #
28     # For the following variables two sets of values exist; first one is the
29     # common one and has the given PREFIX. The second set contains flags
30     @@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
31     REQUIRED_VARS PKG_CONFIG_EXECUTABLE
32     VERSION_VAR PKG_CONFIG_VERSION_STRING)
33    
34     +# This is needed because the module name is "PkgConfig" but the name of
35     +# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
36     +# handled by FPHSA.
37     +set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
38     +
39     # Unsets the given variables
40     macro(_pkgconfig_unset var)
41     set(${var} "" CACHE INTERNAL "")
42     diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
43     index 6604208..fc65e58 100644
44     --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
45     +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
46     @@ -71,7 +71,7 @@ endmacro(check_version_string)
47     # reported.
48    
49     foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
50     - JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
51     + JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
52     check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
53     endforeach(VTEST)
54    
55     @@ -82,4 +82,3 @@ endforeach(VTEST)
56    
57     check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
58     check_version_string(SUBVERSION Subversion_VERSION_SVN)
59     -check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
60     --
61     1.7.0
62    

  ViewVC Help
Powered by ViewVC 1.1.20