diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-07-03 11:06:48 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-07-03 11:06:48 -0400 |
| commit | deccba2807bbb3af41d45fb858f6eb9e4c9eb7a4 (patch) | |
| tree | c6e11cd9790598aa6bc4b88ea2ea21a8bb951c25 /gio | |
| parent | 95fa229f34f8efdbe44091d1f3f9a87c3139bd52 (diff) | |
| download | glib-deccba2807bbb3af41d45fb858f6eb9e4c9eb7a4.tar.gz | |
Meson: Use subdir_done() now that it has been fixed
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/fam/meson.build | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/gio/fam/meson.build b/gio/fam/meson.build index fdbdd15c6..d24670a63 100644 --- a/gio/fam/meson.build +++ b/gio/fam/meson.build @@ -1,36 +1,36 @@ -# FIXME: We should use subdir_done() instead of if blocks, but it's broken in -# meson 0.46.1. See https://github.com/mesonbuild/meson/issues/3700. -if get_option('fam') - fam_dep = cc.find_library('fam') - fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args - if cc.has_function('FAMNoExists', dependencies : fam_dep) - fam_c_args += '-DHAVE_FAM_NO_EXISTS=1' - endif +if not get_option('fam') + subdir_done() +endif + +fam_dep = cc.find_library('fam') +fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args +if cc.has_function('FAMNoExists', dependencies : fam_dep) + fam_c_args += '-DHAVE_FAM_NO_EXISTS=1' +endif - deps = [ - fam_dep, - libglib_dep, - libgobject_dep, - libgio_dep, - ] +deps = [ + fam_dep, + libglib_dep, + libgobject_dep, + libgio_dep, +] - symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map') - fam_ldflags = cc.get_supported_link_arguments([ - '-Wl,--version-script,' + symbol_map, - '-Wl,-no-undefined', - ]) +symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map') +fam_ldflags = cc.get_supported_link_arguments([ + '-Wl,--version-script,' + symbol_map, + '-Wl,-no-undefined', +]) - module = shared_module('giofam', 'gfamfilemonitor.c', - include_directories : [gmoduleinc], - dependencies : deps, - c_args : fam_c_args, - link_args : fam_ldflags, - link_depends : symbol_map, - install_dir : glib_giomodulesdir, - install : true, - ) +module = shared_module('giofam', 'gfamfilemonitor.c', + include_directories : [gmoduleinc], + dependencies : deps, + c_args : fam_c_args, + link_args : fam_ldflags, + link_depends : symbol_map, + 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) - endif +if not meson.is_cross_build() + meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir) endif |