From 0c1b525c880c9f34b27ec94771929ed68c6d7b72 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Mon, 30 Jan 2023 13:10:07 +0100 Subject: [PATCH] cmake,meson: Set minimum glib version to 2.72 This version is required for glib-based tests with AF_UNIX support under Windows. As dbus is at the beginning of a new development branch and 2.72 is quite old (2022), the minimum version has been unconditionally raised. --- CMakeLists.txt | 3 ++- meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6aa0a08..d710de15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,8 @@ endif() find_package(EXPAT) find_package(X11) -find_package(GLIB2) +set(GLIB_MIN_VERSION 2.72) # for AF_UNIX +find_package(GLIB2 ${GLIB_MIN_VERSION}) if(GLIB2_FOUND) option(DBUS_WITH_GLIB "build with glib" ON) endif() diff --git a/meson.build b/meson.build index 7281b7ec..6ac73a3c 100644 --- a/meson.build +++ b/meson.build @@ -397,11 +397,12 @@ endif # a running dbus-daemon will be disabled if message_bus is not set. message_bus = get_option('message_bus') +minimum_glib = '2.72' # for AF_UNIX if get_option('modular_tests').disabled() glib = dependency('', required: false) else glib = dependency( - 'glib-2.0', version: '>=2.40', + 'glib-2.0', version: '>=' + minimum_glib, required: get_option('modular_tests'), fallback: ['glib', 'libglib_dep'], default_options: fallback_subproject_options + [