Skip to content

Commit

Permalink
[meson] Disable benchmark feature by default
Browse files Browse the repository at this point in the history
It downloads a dependency from the internet, and in the same time not
used anywhere (one needs to explicitly call ninja benchmark), not even
on the CI (not sure if it that would make much sense since it does not
seem to ever fail).
  • Loading branch information
khaledhosny committed Feb 9, 2021
1 parent b6f47af commit 68d2e1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
12 changes: 2 additions & 10 deletions meson.build
Expand Up @@ -352,16 +352,8 @@ if not get_option('tests').disabled()
subdir('test')
endif

# get_option('wrap_mode') isn't available in <0.49 and this
# is just an internal tool
if meson.version().version_compare('>=0.49')
if (not get_option('benchmark').disabled() and
get_option('wrap_mode') != 'nodownload' and
host_machine.system() != 'windows' and
not meson.is_subproject() and
not meson.is_cross_build())
subdir('perf')
endif
if not get_option('benchmark').disabled()
subdir('perf')
endif

if not get_option('docs').disabled()
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
Expand Up @@ -28,7 +28,7 @@ option('introspection', type: 'feature', value: 'auto', yield: true,
option('docs', type: 'feature', value: 'auto', yield: true,
description: 'Generate documentation with gtk-doc')

option('benchmark', type: 'feature', value: 'auto',
option('benchmark', type: 'feature', value: 'disabled',
description: 'Enable benchmark tests')
option('icu_builtin', type: 'boolean', value: false,
description: 'Don\'t separate ICU support as harfbuzz-icu module')
Expand Down

0 comments on commit 68d2e1b

Please sign in to comment.