cmake: Always try to find pkg-config

Commit 97bdefd4e2598e6ea72337acb4230928594bda81 move the
include(FindPkgConfig) call into a Linux-specific codepath, so pkg-config
was not being detected on FreeBSD. This mean that the check for
PKG_CONFIG_FOUND to determine whether to install .pc files later on
would always fail and .pc files were not installed on FreeBSD.

(cherry picked from commit 82f5c966442a455edf0bae4fbc17e35abdf7db5e)
Backported-from: dbus!280

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98904504c5aa658a2de05b8e67324c08e7a1c125..fc405d2cd4d751ff3bf941e123cb2ef17a438d7b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,9 +144,13 @@ option(DBUS_DISABLE_ASSERT "Disable assertion checking" OFF)
 option(DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
 option(ENABLE_TRADITIONAL_ACTIVATION "Enable traditional activation (without using systemd)" ON)
 
+find_package(PkgConfig)
+
 if(DBUS_LINUX)
     add_auto_option(ENABLE_SYSTEMD "build with systemd at_console support" AUTO)
-    include(FindPkgConfig)
+    if (NOT PKG_CONFIG_FOUND)
+        message(SEND_ERROR "pkg-config not found, this is required on Linux systems")
+    endif()
     pkg_check_modules(SYSTEMD libsystemd>=209)
     if(NOT SYSTEMD_FOUND)
         pkg_check_modules(SYSTEMD libsystemd-login>=32 libsystemd-daemon>=32 libsystemd-journal>=32)