luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Drop checks and workarounds for older Meson versions

Browse Source 
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall
2022-05-05 19:24:30 +01:00
parent 1bdce46399
commit 25ab87d8e5
8 changed files with 24 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gio/meson.build
View File

@@ -829,17 +829,12 @@ schemas_subdir = join_paths('glib-2.0', 'schemas')
libgio_dep = declare_dependency(link_with : libgio,
dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
include_directories : [gioinc])
# Work around variables kwarg requiring Meson 0.56
if meson.version().version_compare('>=0.56.0')
libgio_dep = declare_dependency(dependencies: libgio_dep,
variables: [
'schemasdir=' + join_paths(glib_datadir, schemas_subdir),
'giomoduledir=' + glib_giomodulesdir,
]
)
endif
include_directories : [gioinc],
variables : [
'schemasdir=' + join_paths(glib_datadir, schemas_subdir),
'giomoduledir=' + glib_giomodulesdir,
],
)
pkg.generate(libgio,
requires : ['glib-2.0', 'gobject-2.0'],
@@ -861,11 +856,7 @@ pkg.generate(libgio,
name : 'GIO',
description : 'glib I/O library',
)
if meson.version().version_compare('>=0.54.0')
meson.override_dependency('gio-2.0', libgio_dep)
endif
meson.override_dependency('gio-2.0', libgio_dep)
if host_system == 'windows'
pkg.generate(requires : ['gobject-2.0', 'gmodule-no-export-2.0', 'gio-2.0'],
@@ -876,9 +867,7 @@ if host_system == 'windows'
name : 'GIO Windows specific APIs',
description : 'Windows specific headers for glib I/O library',
)
if meson.version().version_compare('>=0.54.0')
meson.override_dependency('gio-windows-2.0', libgio_dep)
endif
meson.override_dependency('gio-windows-2.0', libgio_dep)
else
pkg.generate(requires : ['gobject-2.0', 'gio-2.0'],
subdirs : ['gio-unix-2.0'],
@@ -888,9 +877,7 @@ else
name : 'GIO unix specific APIs',
description : 'unix specific headers for glib I/O library',
)
if meson.version().version_compare('>=0.54.0')
meson.override_dependency('gio-unix-2.0', libgio_dep)
endif
meson.override_dependency('gio-unix-2.0', libgio_dep)
endif
if host_system == 'windows'