From 0066a5eea84891f4ab8299976c51614b29cc111f Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Wed, 27 May 2026 10:26:47 +0800 Subject: [PATCH] Remove all feature.enable_auto_if(not meson.is_subproject()) Align with upstream wrapdb policy. --- examples/algorithms/meson.build | 1 + examples/bitsets/meson.build | 1 + examples/coroutines/meson.build | 1 + examples/hashmaps/meson.build | 1 + examples/linkedlists/meson.build | 1 + examples/meson.build | 4 ++-- examples/mixed/meson.build | 1 + examples/priorityqueues/meson.build | 1 + examples/queues/meson.build | 1 + examples/regularexpressions/meson.build | 1 + examples/smartpointers/meson.build | 4 +++- examples/sortedmaps/meson.build | 1 + examples/spans/meson.build | 1 + examples/strings/meson.build | 1 + examples/vectors/meson.build | 1 + meson.build | 1 - tests/meson.build | 5 +++-- 17 files changed, 21 insertions(+), 6 deletions(-) diff --git a/examples/algorithms/meson.build b/examples/algorithms/meson.build index d678f83c5..21dc4081e 100644 --- a/examples/algorithms/meson.build +++ b/examples/algorithms/meson.build @@ -13,6 +13,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'algorithm', ) diff --git a/examples/bitsets/meson.build b/examples/bitsets/meson.build index c26d0e045..53c3b5725 100644 --- a/examples/bitsets/meson.build +++ b/examples/bitsets/meson.build @@ -10,6 +10,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'cbits', ) diff --git a/examples/coroutines/meson.build b/examples/coroutines/meson.build index 5a6c96c3a..cdcfe3cb6 100644 --- a/examples/coroutines/meson.build +++ b/examples/coroutines/meson.build @@ -24,6 +24,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'coroutine', ) diff --git a/examples/hashmaps/meson.build b/examples/hashmaps/meson.build index 373b7cd44..db8a112b5 100644 --- a/examples/hashmaps/meson.build +++ b/examples/hashmaps/meson.build @@ -15,6 +15,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'hmap', ) diff --git a/examples/linkedlists/meson.build b/examples/linkedlists/meson.build index 3e56e45ec..3acbef956 100644 --- a/examples/linkedlists/meson.build +++ b/examples/linkedlists/meson.build @@ -12,6 +12,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'list', ) diff --git a/examples/meson.build b/examples/meson.build index e38d51888..0fbf1ed46 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,6 +1,6 @@ -examples = get_option('examples').enable_auto_if(root) +examples = get_option('examples') -if examples.enabled() +if examples.allowed() example_deps = [ stc_dep, cc.find_library('m', required: false), diff --git a/examples/mixed/meson.build b/examples/mixed/meson.build index e9d719689..f57ed70ab 100644 --- a/examples/mixed/meson.build +++ b/examples/mixed/meson.build @@ -14,6 +14,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), ) endforeach diff --git a/examples/priorityqueues/meson.build b/examples/priorityqueues/meson.build index 2ac3c70c9..eb374945c 100644 --- a/examples/priorityqueues/meson.build +++ b/examples/priorityqueues/meson.build @@ -10,6 +10,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'pqueue', ) diff --git a/examples/queues/meson.build b/examples/queues/meson.build index cee0b2987..c1da7aa2d 100644 --- a/examples/queues/meson.build +++ b/examples/queues/meson.build @@ -9,6 +9,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'queue', ) diff --git a/examples/regularexpressions/meson.build b/examples/regularexpressions/meson.build index cede1d802..9d046a9d0 100644 --- a/examples/regularexpressions/meson.build +++ b/examples/regularexpressions/meson.build @@ -12,6 +12,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'cregex', ) diff --git a/examples/smartpointers/meson.build b/examples/smartpointers/meson.build index a00facfa8..cfffcc0f9 100644 --- a/examples/smartpointers/meson.build +++ b/examples/smartpointers/meson.build @@ -14,7 +14,9 @@ foreach sample : [ executable( sample, files(f'@sample@.c'), - dependencies: example_deps, install: false, + dependencies: example_deps, + install: false, + build_by_default: false, ), suite: 'arc', ) diff --git a/examples/sortedmaps/meson.build b/examples/sortedmaps/meson.build index 7f189f3f3..3b81b522f 100644 --- a/examples/sortedmaps/meson.build +++ b/examples/sortedmaps/meson.build @@ -16,6 +16,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'hmap', ) diff --git a/examples/spans/meson.build b/examples/spans/meson.build index 6673072cb..101017924 100644 --- a/examples/spans/meson.build +++ b/examples/spans/meson.build @@ -21,6 +21,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: span_deps, install: false, + build_by_default: false, ), suite: 'cspan', ) diff --git a/examples/strings/meson.build b/examples/strings/meson.build index e203af2b1..e70afabe7 100644 --- a/examples/strings/meson.build +++ b/examples/strings/meson.build @@ -14,6 +14,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'cstr', ) diff --git a/examples/vectors/meson.build b/examples/vectors/meson.build index 210b5a53e..b55ab9976 100644 --- a/examples/vectors/meson.build +++ b/examples/vectors/meson.build @@ -10,6 +10,7 @@ foreach sample : [ files(f'@sample@.c'), dependencies: example_deps, install: false, + build_by_default: false, ), suite: 'vec', ) diff --git a/meson.build b/meson.build index e080b3478..9e79cea70 100644 --- a/meson.build +++ b/meson.build @@ -167,7 +167,6 @@ if flex_exe.found() meson.override_find_program('checkscoped', checkscoped_exe) endif -root = not meson.is_subproject() subdir('tests') subdir('examples') diff --git a/tests/meson.build b/tests/meson.build index 02c70113b..f48130f68 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,6 @@ -tests = get_option('tests').enable_auto_if(root) +tests = get_option('tests') -if tests.enabled() +if tests.allowed() tests_deps = [ stc_dep, cc.find_library('m', required: false), @@ -62,6 +62,7 @@ if tests.enabled() c_args: ['-D_GNU_SOURCE'], dependencies: tests_deps, install: false, + build_by_default: false, ) foreach unit : filter test(