From c7aa4c8861eb6c1d3534b3b0e94e901b7b2d0206 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sat, 7 Mar 2020 00:34:05 +0530 Subject: coredata: Set default options as cmdline args that override each other The previous code was assuming that options do not depend on each other, and that you can set defaults using `dict.setdefault()`. This is not true for `buildtype` + `optimization`/`debug`, so we add defaults + overrides in the right order and use the options parsing code later to compute the values. Includes a test. Closes https://github.com/mesonbuild/meson/issues/6752 --- test cases/common/1 trivial/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test cases') diff --git a/test cases/common/1 trivial/meson.build b/test cases/common/1 trivial/meson.build index c476c37..fb1142c 100644 --- a/test cases/common/1 trivial/meson.build +++ b/test cases/common/1 trivial/meson.build @@ -1,7 +1,7 @@ # Comment on the first line project('trivial test', # Comment inside a function call + array for language list - ['c'], + ['c'], default_options: ['buildtype=debug'], meson_version : '>=0.52.0') #this is a comment sources = 'trivial.c' -- cgit v1.1