diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
| commit | 1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba (patch) | |
| tree | 475ec53133c361c13c0a1b1793fd1e00c1e0b3ce /dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | |
| parent | f5837fc796cabbbe572d5b5879eb4ce0aef665b4 (diff) | |
| parent | e1cdc85bc123113b6b9fb4212effda45ef262185 (diff) | |
| download | kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.gz kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.bz2 kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
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) |