diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-01-11 01:29:27 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-01-11 01:29:27 +1100 |
| commit | 9adb3b0f90aa914c43e07a4216b77d175627bfb5 (patch) | |
| tree | f0a9dc77c117cb75e595d34585906458d70aa5cf /dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | |
| parent | 49df345c5a5bc319ed67bcd5444f709fe7d9a034 (diff) | |
| download | kde-9adb3b0f90aa914c43e07a4216b77d175627bfb5.tar.gz kde-9adb3b0f90aa914c43e07a4216b77d175627bfb5.tar.bz2 kde-9adb3b0f90aa914c43e07a4216b77d175627bfb5.zip | |
[dev-util/cmake] Add improved Python patch for testing wrt bug #405181.
Package-Manager: portage-2.1.11.38
RepoMan-Options: --force
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch new file mode 100644 index 00000000000..c5e17c5ba64 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch @@ -0,0 +1,18 @@ +diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake +index c47f583..5783d37 100644 +--- a/Modules/FindPkgConfig.cmake ++++ b/Modules/FindPkgConfig.cmake +@@ -87,7 +87,12 @@ + set(PKG_CONFIG_VERSION 1) + set(PKG_CONFIG_FOUND 0) + +-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++if(NOT PKG_CONFIG_EXECUTABLE) ++ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) ++ if(NOT PKG_CONFIG_EXECUTABLE) ++ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") ++ endif(NOT PKG_CONFIG_EXECUTABLE) ++endif(NOT PKG_CONFIG_EXECUTABLE) + mark_as_advanced(PKG_CONFIG_EXECUTABLE) + + if(PKG_CONFIG_EXECUTABLE) |