From: Soeren Apel <redacted>
Date: Fri, 8 Sep 2023 18:37:13 +0000 (+0200)
Subject: Fix glibmm dependency check
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e0a90b4c5d6b1163a2cbece13a90f2737f0814d4;p=pulseview.git

Fix glibmm dependency check

https://sigrok.org/gitweb/?p=pulseview.git;a=commit;f=CMakeLists.txt;h=33c5ac28f73aa35c5fc4bbcf69a5ae61c0b50989 introduced the line

pkg_check_modules(GLIBMM_2_4 glibmm-2.4>2.28.0)

but https://cmake.org/cmake/help/v3.0/module/FindPkgConfig.html states

A <MODULE> parameter can have the following formats:

{MODNAME}            ... matches any version
{MODNAME}>={VERSION} ... at least version <VERSION> is required
{MODNAME}={VERSION}  ... exactly version <VERSION> is required
{MODNAME}<={VERSION} ... modules must not be newer than <VERSION>

Hence, ">" is an invalid atom and always makes the check fail. On systems without glibmm-2.68, this leads to glibmm not being found and the build aborting.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08d0ded5..395222a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,7 @@ list(APPEND PKGDEPS glib-2.0>=2.28.0)
 
 # Try to find the prefered glibmm-2.4. If not found then add glibmm-2.68
 # to the dependency list.
-pkg_check_modules(GLIBMM_2_4 glibmm-2.4>2.28.0)
+pkg_check_modules(GLIBMM_2_4 glibmm-2.4>=2.28.0)
 if(GLIBMM_2_4_FOUND)
 	list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
 else()