From 9adb3b0f90aa914c43e07a4216b77d175627bfb5 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Fri, 11 Jan 2013 01:29:27 +1100 Subject: [dev-util/cmake] Add improved Python patch for testing wrt bug #405181. Package-Manager: portage-2.1.11.38 RepoMan-Options: --force --- dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch (limited to 'dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch') 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) -- cgit v1.2.3