From d4e867809b5b16a4eda0751c7d0148b13b0e35d9 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 22 Apr 2021 14:59:04 -0700 Subject: store the list of initializes subprojects in the coredata structure We need to konw on rconfigure which options have already bee set not just for the super project, but also for the subproject. However, using first_invocation is not sufficient, as a reconfigure could add a new subpproject that wasn't present before, and we need to initialize that project's builtins. --- test cases/unit/48 reconfigure/meson.build | 2 ++ test cases/unit/48 reconfigure/subprojects/sub1/meson.build | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 test cases/unit/48 reconfigure/subprojects/sub1/meson.build (limited to 'test cases/unit') diff --git a/test cases/unit/48 reconfigure/meson.build b/test cases/unit/48 reconfigure/meson.build index 6eaac5db7..4f35458a8 100644 --- a/test cases/unit/48 reconfigure/meson.build +++ b/test cases/unit/48 reconfigure/meson.build @@ -7,3 +7,5 @@ message('opt4 ' + get_option('opt4')) exe = executable('test1', 'main.c') test('test1', exe) + +sub1 = subproject('sub1') diff --git a/test cases/unit/48 reconfigure/subprojects/sub1/meson.build b/test cases/unit/48 reconfigure/subprojects/sub1/meson.build new file mode 100644 index 000000000..4f3d2fc4e --- /dev/null +++ b/test cases/unit/48 reconfigure/subprojects/sub1/meson.build @@ -0,0 +1,3 @@ +project('sub1') + +message('sub1:werror', get_option('werror')) -- cgit v1.3