From d17554d30fe298f1e0515280d6787174e896b47f Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Wed, 21 Apr 2021 09:11:13 +1000 Subject: [PATCH] build: Ensure vala defines are passed through to valadoc --- src/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index a67336af..07f2158f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -33,10 +33,14 @@ endif # Symbols for valac's preprocessor must be defined as compiler args, # not in the code or in config.h +vala_defines = [] + if get_option('ref_tracking').enabled() - geary_vala_args += [ '--define=REF_TRACKING' ] + vala_defines += [ '--define=REF_TRACKING' ] endif +geary_vala_args += vala_defines + # Common cc options geary_c_args = [ '-include', 'config.h', @@ -179,7 +183,7 @@ if valadoc.found() '--package-version=@0@'.format(meson.project_version()), '-b', meson.current_source_dir(), '-o', '@OUTPUT@', - ] + valadoc_dep_args + valadoc_vapidir_args + [ + ] + vala_defines + valadoc_dep_args + valadoc_vapidir_args + [ '@INPUT@' ] )