diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-04-30 11:04:35 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-04-30 11:04:35 +0200 |
| commit | 5ba010a35ad373030c8dfaffab1e8969660e3cf4 (patch) | |
| tree | 12cf750f658db2728b0e3c7f704b6c087d5d9a40 /dev-util/cmake/files | |
| parent | bcaf2fbb854b1fffc004ff9094050526fadc8f81 (diff) | |
| download | kde-5ba010a35ad373030c8dfaffab1e8969660e3cf4.tar.gz kde-5ba010a35ad373030c8dfaffab1e8969660e3cf4.tar.bz2 kde-5ba010a35ad373030c8dfaffab1e8969660e3cf4.zip | |
[dev-util/cmake] Add patch for FindPkgConfig to respect PKG_CONFIG environment variable by DaboD <daiderek@gmail.com> bug 414037.
(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
Diffstat (limited to 'dev-util/cmake/files')
| -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) |