7defea07ff
Since commit 4fbdce2b (try_compile: Use random executable file name, 2012-02-13) a different <target>.dir is used for each try-compile. Cleanup the directories as well as their content to avoid accumulating leftover temporary directories. (upstream git commit 953257ca611526c9a161a22e5148802be1c67649) Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests (from gentoo's package/dev-util/cmake/files/) Sync FindPkgConfig.cmake patch with upstream
33 lines
1.5 KiB
Plaintext
33 lines
1.5 KiB
Plaintext
$OpenBSD: patch-Modules_FindPkgConfig_cmake,v 1.2 2012/05/07 13:58:18 dcoppa Exp $
|
|
|
|
FindPkgConfig.cmake: fix documented output variable not set
|
|
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
|
|
|
|
--- Modules/FindPkgConfig.cmake.orig Thu May 3 09:28:55 2012
|
|
+++ Modules/FindPkgConfig.cmake Thu May 3 09:30:09 2012
|
|
@@ -13,11 +13,10 @@
|
|
# When the 'QUIET' argument is set, no status messages will be printed.
|
|
#
|
|
# It sets the following variables:
|
|
-# PKG_CONFIG_FOUND ... true if pkg-config works on the system
|
|
+# PKG_CONFIG_FOUND ... if pkg-config executable was found
|
|
# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
|
|
# PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
|
|
# (since CMake 2.8.8)
|
|
-# PKG_CONFIG_FOUND ... if pkg-config executable was found
|
|
#
|
|
# For the following variables two sets of values exist; first one is the
|
|
# common one and has the given PREFIX. The second set contains flags
|
|
@@ -103,6 +102,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleSta
|
|
find_package_handle_standard_args(PkgConfig
|
|
REQUIRED_VARS PKG_CONFIG_EXECUTABLE
|
|
VERSION_VAR PKG_CONFIG_VERSION_STRING)
|
|
+
|
|
+# This is needed because the module name is "PkgConfig" but the name of
|
|
+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
|
|
+# handled by FPHSA.
|
|
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
|
|
|
|
# Unsets the given variables
|
|
macro(_pkgconfig_unset var)
|