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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Wed May 2 21:02:53 2012 UTC (2 years, 7 months ago) by johu
Branch: MAIN
CVS Tags: HEAD
Version bump by me and Chris Reffett <geekboy72@gmail.com> wrt bug #412925. Adds patch for FindPkgConfig to respect PKG_CONFIG environment variable by DaboD <daiderek@gmail.com> bug #414037.

(Portage version: 2.2.0_alpha101/cvs/Linux i686)

1 diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
2 index c47f583..5783d37 100644
3 --- a/Modules/FindPkgConfig.cmake
4 +++ b/Modules/FindPkgConfig.cmake
5 @@ -87,7 +87,12 @@
6 set(PKG_CONFIG_VERSION 1)
7 set(PKG_CONFIG_FOUND 0)
8
9 -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
10 +if(NOT PKG_CONFIG_EXECUTABLE)
11 + set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
12 + if(NOT PKG_CONFIG_EXECUTABLE)
13 + find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
14 + endif(NOT PKG_CONFIG_EXECUTABLE)
15 +endif(NOT PKG_CONFIG_EXECUTABLE)
16 mark_as_advanced(PKG_CONFIG_EXECUTABLE)
17
18 if(PKG_CONFIG_EXECUTABLE)

  ViewVC Help
Powered by ViewVC 1.1.20