From: Alex Richardson <arichardson@FreeBSD.org>
Date: Sun, 29 May 2022 12:58:49 +0000 (+0000)
Subject: cmake: Always try to find pkg-config
X-Git-Tag: dbus-1.15.0~14^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f5c966442a455edf0bae4fbc17e35abdf7db5e;p=thirdparty%2Fdbus.git

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.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2deada7c2..58ed3d89c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,9 +132,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)