[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:
Ebrahim Byagowi committed 2020-07-15 13:33:00 +04:30
1 parent dc981fe951
commit 8cbdb6fa41
2 files changed
+5 -6

No files matched your search

+1 -2
View File
@@ -49,8 +49,7 @@ jobs:
--auto-features=enabled \
-Ddirectwrite=enabled \
-Dgdi=enabled \
-Dgraphite=enabled \
-Dbenchmark=disabled
-Dgraphite=enabled
ninja -C build
- name: Test
run: |
+4 -4
View File
@@ -344,10 +344,10 @@ if not get_option('tests').disabled()
endif
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()) or get_option('benchmark').enabled())
get_option('wrap_mode') != 'nodownload' and \
host_machine.system() != 'windows' and \
not meson.is_subproject() and \
not meson.is_cross_build()
subdir('perf')
endif