sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lower Meson version requirement to 0.55.x (#3257)

Browse Source 
Allowing libvips to be compiled on RHEL 7 (and its derivatives).
This commit is contained in:
Kleis Auke Wolthuizen 2023-01-02 21:35:50 +01:00 committed by GitHub
parent 9419b3636f
commit 1b9a6397d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/meson.build
View File

@ -51,7 +51,7 @@ private_libvips_headers = [
private_headers = [] private_headers = []
foreach private_libvips_header : private_libvips_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 endforeach
markdown_content_files = files( markdown_content_files = files(
@ -137,8 +137,8 @@ gnome.gtkdoc('libvips',
mode: 'none', mode: 'none',
main_xml: 'libvips-docs.xml.in', main_xml: 'libvips-docs.xml.in',
src_dir: [ src_dir: [
join_paths(meson.project_source_root(), 'libvips'), join_paths(project_source_root, 'libvips'),
join_paths(meson.project_build_root(), 'libvips'), join_paths(project_build_root, 'libvips'),
], ],
dependencies: libvips_dep, dependencies: libvips_dep,
scan_args: [ scan_args: [

6
meson.build
View File

@ -1,6 +1,6 @@
project('vips', 'c', 'cpp', project('vips', 'c', 'cpp',
version: '8.14.1', version: '8.14.1',
meson_version: '>=0.56', meson_version: '>=0.55',
default_options: [ default_options: [
# this is what glib uses (one of our required deps), so we use it too # this is what glib uses (one of our required deps), so we use it too
'c_std=gnu99', 'c_std=gnu99',
@ -70,6 +70,10 @@ nodelete_link_args = cc.get_supported_link_arguments('-Wl,-z,nodelete')
prefix_dir = get_option('prefix') prefix_dir = get_option('prefix')
lib_dir = prefix_dir / get_option('libdir') 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' if gmodule_dep.found() and gmodule_dep.get_variable(pkgconfig: 'gmodule_supported') == 'true'
# Disable modules by default when building static libraries # Disable modules by default when building static libraries
modules_enabled = get_option('modules').enabled() or get_option('default_library') == 'shared' modules_enabled = get_option('modules').enabled() or get_option('default_library') == 'shared'

4
test/meson.build
View File

@ -1,6 +1,6 @@
variables_data = configuration_data() variables_data = configuration_data()
variables_data.set('abs_top_srcdir', meson.project_source_root()) variables_data.set('abs_top_srcdir', project_source_root)
variables_data.set('abs_top_builddir', meson.project_build_root()) variables_data.set('abs_top_builddir', project_build_root)
variables_data.set('PYTHON', pymod.find_installation().full_path()) variables_data.set('PYTHON', pymod.find_installation().full_path())
variables_sh = configure_file( variables_sh = configure_file(