Skip to content

Commit 0921c26

Browse files
committed
Allow the memory extra and fixture extra to be enabled seperatly.
1 parent cdf1d02 commit 0921c26

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

meson.build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@ unity_inc = []
3434
subdir('src')
3535

3636
if build_fixture
37-
# Building the fixture extension implies building the memory
38-
# extension.
39-
build_memory = true
4037
subdir('extras/fixture/src')
4138
endif
4239

43-
if build_memory
40+
if build_memory.enabled() or (build_memory.auto() and build_fixture)
4441
subdir('extras/memory/src')
42+
else
43+
unity_args += '-DUNITY_FIXTURE_NO_EXTRAS'
4544
endif
4645

4746
if support_double

meson_options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
option('extension_fixture', type: 'boolean', value: 'false', description: 'Whether to enable the fixture extension.')
2-
option('extension_memory', type: 'boolean', value: 'false', description: 'Whether to enable the memory extension.')
3-
option('support_double', type: 'boolean', value: 'false', description: 'Whether to enable double precision floating point assertions.')
1+
option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.')
2+
option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.')
3+
option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.')

0 commit comments

Comments
 (0)