From d7bf365acdadf6bb5a456bbe405132cd17c3e5af Mon Sep 17 00:00:00 2001 From: Charles Brunet Date: Tue, 9 Jan 2024 20:37:15 -0500 Subject: Fix compiler.preprocess compile_args not used As described in https://github.com/mesonbuild/meson/issues/12715#issuecomment-1883448780, the compiler.preprocess function ignores compile_args. This should fix it in both ninja and visualstudio backends. --- test cases/common/259 preprocess/bar.c | 2 +- test cases/common/259 preprocess/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test cases') diff --git a/test cases/common/259 preprocess/bar.c b/test cases/common/259 preprocess/bar.c index 0d961e675..598abcab0 100644 --- a/test cases/common/259 preprocess/bar.c +++ b/test cases/common/259 preprocess/bar.c @@ -1,3 +1,3 @@ int @BAR@(void) { - return BAR + PLOP; + return BAR + PLOP + BAZ; } diff --git a/test cases/common/259 preprocess/meson.build b/test cases/common/259 preprocess/meson.build index 40168f95d..2ca5bed59 100644 --- a/test cases/common/259 preprocess/meson.build +++ b/test cases/common/259 preprocess/meson.build @@ -20,7 +20,9 @@ dep = declare_dependency(compile_args: '-DPLOP=0') pp_files = cc.preprocess('foo.c', bar_x, 'math.c', output: '@PLAINNAME@.c', dependencies: dep, - depends: foo_h) + depends: foo_h, + compile_args: ['-DBAZ=0'], +) foreach f : pp_files message(f.full_path()) -- cgit v1.2.3