From e895835b0d2b03de9715cb68e12a9f15ad8e717c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 3 Apr 2019 06:27:35 +0200 Subject: [PATCH] CMakeLists: Align PKGCONF_REQ_PRIVATE required versions The minimum version requirements are a bit odd: At build time of ulfius, libmicrohttpd ">= 0.9.51" is sufficient, but then a pkg-config file is installed stating "PKGCONF_REQ_PRIVATE > 0.9.51", i.e. explicitly excluding 0.9.51 itself. The same is the case with gnutls and libmicrohttpd 0.9.53 in case of websockets. On the other hand, CPACK_DEBIAN_PACKAGE_DEPENDS again states ">=", so we had two instances where ">=" was sufficient, but only one where ">" was required. This matters on Debian stretch, where exactly version 0.9.51 of libmicrohttpd is packaged and hence ulfius builds and gets packaged, but then one cannot build any applications against ulfius. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4337c01..eaf339b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,12 +272,12 @@ if (WITH_JANSSON) set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, jansson") endif () if (WITH_GNUTLS) - set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, gnutls > 3.5.0") + set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, gnutls >= 3.5.0") endif () if (WITH_WEBSOCKET) - set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, libmicrohttpd > 0.9.53") + set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, libmicrohttpd >= 0.9.53") else () - set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, libmicrohttpd > 0.9.51") + set (PKGCONF_REQ_PRIVATE "${PKGCONF_REQ_PRIVATE}, libmicrohttpd >= 0.9.51") endif () # build ulfius-cfg.h file