diff options
| author | Johannes Huber <johu@gentoo.org> | 2012-08-15 15:24:44 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-08-15 15:24:44 +0200 |
| commit | 8b5bfd2430ee0ff1989668ff97db024bb5a3c390 (patch) | |
| tree | f1afdb15f96deeed55eef7403d5a7e44322099aa /dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | |
| parent | 04c014b6199d8573f8c4ca5033c58e1ae25f5c42 (diff) | |
| download | kde-8b5bfd2430ee0ff1989668ff97db024bb5a3c390.tar.gz kde-8b5bfd2430ee0ff1989668ff97db024bb5a3c390.tar.bz2 kde-8b5bfd2430ee0ff1989668ff97db024bb5a3c390.zip | |
[dev-util/cmake] Version bump 2.8.9.
(Portage version: 2.2.0_alpha120/git/Linux i686, unsigned Manifest commit)
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) |