diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-02-26 06:22:40 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-02-26 06:22:40 +1100 |
| commit | 49f71dc215bb4d7337c826e7fbad8b1539e5ab81 (patch) | |
| tree | 36d4d2a2ac00ef3d3141a0dd35df64610524b46e /dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | |
| parent | 0f1b15c95fa4d0fbe77c819166e39f52c9566275 (diff) | |
| download | kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.tar.gz kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.tar.bz2 kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.zip | |
[dev-util/cmake] Improve boost python patch to fix libboost_python detection outside of portage wrt bug #500442.
Package-Manager: portage-2.2.7
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) |