mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-08 18:24:04 +02:00
Meson: Use subdir_done() now that it has been fixed
This commit is contained in:
@@ -1,36 +1,36 @@
|
|||||||
# FIXME: We should use subdir_done() instead of if blocks, but it's broken in
|
if not get_option('fam')
|
||||||
# meson 0.46.1. See https://github.com/mesonbuild/meson/issues/3700.
|
subdir_done()
|
||||||
if get_option('fam')
|
endif
|
||||||
fam_dep = cc.find_library('fam')
|
|
||||||
fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
|
fam_dep = cc.find_library('fam')
|
||||||
if cc.has_function('FAMNoExists', dependencies : fam_dep)
|
fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
|
||||||
fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
|
if cc.has_function('FAMNoExists', dependencies : fam_dep)
|
||||||
endif
|
fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
|
||||||
|
endif
|
||||||
deps = [
|
|
||||||
fam_dep,
|
deps = [
|
||||||
libglib_dep,
|
fam_dep,
|
||||||
libgobject_dep,
|
libglib_dep,
|
||||||
libgio_dep,
|
libgobject_dep,
|
||||||
]
|
libgio_dep,
|
||||||
|
]
|
||||||
symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map')
|
|
||||||
fam_ldflags = cc.get_supported_link_arguments([
|
symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map')
|
||||||
'-Wl,--version-script,' + symbol_map,
|
fam_ldflags = cc.get_supported_link_arguments([
|
||||||
'-Wl,-no-undefined',
|
'-Wl,--version-script,' + symbol_map,
|
||||||
])
|
'-Wl,-no-undefined',
|
||||||
|
])
|
||||||
module = shared_module('giofam', 'gfamfilemonitor.c',
|
|
||||||
include_directories : [gmoduleinc],
|
module = shared_module('giofam', 'gfamfilemonitor.c',
|
||||||
dependencies : deps,
|
include_directories : [gmoduleinc],
|
||||||
c_args : fam_c_args,
|
dependencies : deps,
|
||||||
link_args : fam_ldflags,
|
c_args : fam_c_args,
|
||||||
link_depends : symbol_map,
|
link_args : fam_ldflags,
|
||||||
install_dir : glib_giomodulesdir,
|
link_depends : symbol_map,
|
||||||
install : true,
|
install_dir : glib_giomodulesdir,
|
||||||
)
|
install : true,
|
||||||
|
)
|
||||||
if not meson.is_cross_build()
|
|
||||||
meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
|
if not meson.is_cross_build()
|
||||||
endif
|
meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user