diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-06-19 00:44:47 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-06-19 00:44:47 +1000 |
| commit | 431060f44d9736052138f911452f74f27271ebf7 (patch) | |
| tree | 6d20ddae0133b853617673b94fbf39c702ac9734 /dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | |
| parent | a3b0e72aad01a2007b008fa2047b45680f69600f (diff) | |
| download | kde-431060f44d9736052138f911452f74f27271ebf7.tar.gz kde-431060f44d9736052138f911452f74f27271ebf7.tar.bz2 kde-431060f44d9736052138f911452f74f27271ebf7.zip | |
[dev-util/cmake] Version bump.
Package-Manager: portage-2.2.10
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) |