fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: move openmp block out of the middle of the x11 deps block

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32032>
This commit is contained in:
Eric Engestrom 2024-11-07 14:15:30 +01:00 • committed by Marge Bot
parent 594b8d9f81
commit 9dc872c4c7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
meson.build
View file

@ -2037,6 +2037,15 @@ if with_platform_wayland
endif
endif
# Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch.
dep_openmp = null_dep
if host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc'
dep_openmp = dependency('openmp', required : false)
if dep_openmp.found()
pre_args += ['-DHAVE_OPENMP']
endif
endif
dep_x11 = null_dep
dep_xext = null_dep
dep_xfixes = null_dep
@ -2056,15 +2065,6 @@ dep_xshmfence = null_dep
dep_xcb_xrandr = null_dep
dep_xcb_shm = null_dep
dep_xlib_xrandr = null_dep
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', required : false)
if dep_openmp.found()
pre_args += ['-DHAVE_OPENMP']
endif
endif
with_dri3_explicit_sync = false
with_xcb_keysyms = false