From 1b9a6397d7008204956ad29f01fa51c094ba6f1f Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Mon, 2 Jan 2023 21:35:50 +0100 Subject: [PATCH] Lower Meson version requirement to 0.55.x (#3257) Allowing libvips to be compiled on RHEL 7 (and its derivatives). --- doc/meson.build | 6 +++--- meson.build | 6 +++++- test/meson.build | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 4542b10c..ef0ee24e 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -51,7 +51,7 @@ private_libvips_headers = [ private_headers = [] foreach private_libvips_header : private_libvips_headers - private_headers += [join_paths(meson.project_source_root(), 'libvips', private_libvips_header)] + private_headers += [join_paths(project_source_root, 'libvips', private_libvips_header)] endforeach markdown_content_files = files( @@ -137,8 +137,8 @@ gnome.gtkdoc('libvips', mode: 'none', main_xml: 'libvips-docs.xml.in', src_dir: [ - join_paths(meson.project_source_root(), 'libvips'), - join_paths(meson.project_build_root(), 'libvips'), + join_paths(project_source_root, 'libvips'), + join_paths(project_build_root, 'libvips'), ], dependencies: libvips_dep, scan_args: [ diff --git a/meson.build b/meson.build index e5c127b4..05ede4b0 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('vips', 'c', 'cpp', version: '8.14.1', - meson_version: '>=0.56', + meson_version: '>=0.55', default_options: [ # this is what glib uses (one of our required deps), so we use it too 'c_std=gnu99', @@ -70,6 +70,10 @@ nodelete_link_args = cc.get_supported_link_arguments('-Wl,-z,nodelete') prefix_dir = get_option('prefix') lib_dir = prefix_dir / get_option('libdir') + +project_source_root = meson.current_source_dir() +project_build_root = meson.current_build_dir() + if gmodule_dep.found() and gmodule_dep.get_variable(pkgconfig: 'gmodule_supported') == 'true' # Disable modules by default when building static libraries modules_enabled = get_option('modules').enabled() or get_option('default_library') == 'shared' diff --git a/test/meson.build b/test/meson.build index 89a5e9cc..b80c499d 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,6 +1,6 @@ variables_data = configuration_data() -variables_data.set('abs_top_srcdir', meson.project_source_root()) -variables_data.set('abs_top_builddir', meson.project_build_root()) +variables_data.set('abs_top_srcdir', project_source_root) +variables_data.set('abs_top_builddir', project_build_root) variables_data.set('PYTHON', pymod.find_installation().full_path()) variables_sh = configure_file(