fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: OpenMP is supposed to be optional

Browse source 
The code around it checks that it is found, so clearly it was meant to
be optional, not arequired.

Fixes: cd2832ee51
       ("meson: add an optional OpenMP dependency for AMD tests")

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10286>
(cherry picked from commit 5b9253c287)
This commit is contained in:
Dylan Baker 2021-04-16 09:24:27 -07:00 • committed by Eric Engestrom
parent ee3c6aa21a
commit 7359a3cc1a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -490,7 +490,7 @@
"description": "meson: OpenMP is supposed to be optional",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "cd2832ee5107201493d59f70983f162653e53c7d"
},

2
meson.build
View file

@ -1860,7 +1860,7 @@ dep_openmp = null_dep
# Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch.
if host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc'
dep_openmp = dependency('openmp')
dep_openmp = dependency('openmp', required : false)
if dep_openmp.found()
pre_args += ['-DHAVE_OPENMP']
endif