From 7b6e527f440cd7e6f8be2b07cee320ee6ca18786 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 29 Apr 2024 06:41:38 +0200 Subject: Adding upstream version 1.0.1. Signed-off-by: Daniel Baumann --- test cases/unit/107 new subproject on reconfigure/meson.build | 3 +++ .../unit/107 new subproject on reconfigure/meson_options.txt | 1 + .../unit/107 new subproject on reconfigure/subprojects/foo/foo.c | 2 ++ .../107 new subproject on reconfigure/subprojects/foo/meson.build | 8 ++++++++ 4 files changed, 14 insertions(+) create mode 100644 test cases/unit/107 new subproject on reconfigure/meson.build create mode 100644 test cases/unit/107 new subproject on reconfigure/meson_options.txt create mode 100644 test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c create mode 100644 test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build (limited to 'test cases/unit/107 new subproject on reconfigure') diff --git a/test cases/unit/107 new subproject on reconfigure/meson.build b/test cases/unit/107 new subproject on reconfigure/meson.build new file mode 100644 index 0000000..7342c9a --- /dev/null +++ b/test cases/unit/107 new subproject on reconfigure/meson.build @@ -0,0 +1,3 @@ +project('New subproject on reconfigure') + +subproject('foo', required: get_option('foo')) diff --git a/test cases/unit/107 new subproject on reconfigure/meson_options.txt b/test cases/unit/107 new subproject on reconfigure/meson_options.txt new file mode 100644 index 0000000..b3dd683 --- /dev/null +++ b/test cases/unit/107 new subproject on reconfigure/meson_options.txt @@ -0,0 +1 @@ +option('foo', type: 'feature', value: 'disabled') diff --git a/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c new file mode 100644 index 0000000..1edf995 --- /dev/null +++ b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c @@ -0,0 +1,2 @@ +void foo(void); +void foo(void) {} diff --git a/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build new file mode 100644 index 0000000..2a6e30a --- /dev/null +++ b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build @@ -0,0 +1,8 @@ +project('foo', 'c') + +# Ensure that builtin options have been initialised. +assert(get_option('default_library') == 'shared') + +# This uses default_library option internally and used to cause a crash: +# https://github.com/mesonbuild/meson/issues/10225. +library('foo', 'foo.c') -- cgit v1.2.3