luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-13 14:05:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Use subdir_done() now that it has been fixed

Browse Source
This commit is contained in:
Xavier Claessens 2018-07-03 11:06:48 -04:00
parent 95fa229f34
commit deccba2807
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/fam/meson.build
View File

@ -1,6 +1,7 @@
# 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_dep = cc.find_library('fam')
fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
if cc.has_function('FAMNoExists', dependencies : fam_dep) if cc.has_function('FAMNoExists', dependencies : fam_dep)
@ -33,4 +34,3 @@ if get_option('fam')
if not meson.is_cross_build() if not meson.is_cross_build()
meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir) meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
endif endif
endif