[meson] Don't enable benchmark under the conditions ever
As we don't want to make headache for packagers as we don't want to enable it when --auto-features=enabled is used.
This commit is contained in:
parent
dc981fe951
commit
8cbdb6fa41
|
@ -49,8 +49,7 @@ jobs:
|
||||||
--auto-features=enabled \
|
--auto-features=enabled \
|
||||||
-Ddirectwrite=enabled \
|
-Ddirectwrite=enabled \
|
||||||
-Dgdi=enabled \
|
-Dgdi=enabled \
|
||||||
-Dgraphite=enabled \
|
-Dgraphite=enabled
|
||||||
-Dbenchmark=disabled
|
|
||||||
ninja -C build
|
ninja -C build
|
||||||
- name: Test
|
- name: Test
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -344,10 +344,10 @@ if not get_option('tests').disabled()
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if not get_option('benchmark').disabled() and \
|
if not get_option('benchmark').disabled() and \
|
||||||
((get_option('wrap_mode') != 'nodownload' and \
|
get_option('wrap_mode') != 'nodownload' and \
|
||||||
host_machine.system() != 'windows' and \
|
host_machine.system() != 'windows' and \
|
||||||
not meson.is_subproject() and \
|
not meson.is_subproject() and \
|
||||||
not meson.is_cross_build()) or get_option('benchmark').enabled())
|
not meson.is_cross_build()
|
||||||
subdir('perf')
|
subdir('perf')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue