From 5ffdb1092be75e0fe9ca6d67e63cced1e69df410 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 6 Oct 2020 10:28:34 -0700 Subject: [PATCH] meson: generalize libclc usage So that it's not tied directly to clover. Reviewed-by: Jason Ekstrand Reviewed-by: Jesse Natalie Part-of: --- meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index bd6a1fcd495..59582318f47 100644 --- a/meson.build +++ b/meson.build @@ -72,6 +72,7 @@ if with_tools.contains('all') 'xvmc', ] endif +with_clc = false with_intel_tools = with_tools.contains('intel') or with_tools.contains('intel-ui') with_imgui = with_intel_tools or with_vulkan_overlay_layer @@ -802,15 +803,19 @@ if _opencl != 'disabled' error('OpenCL Clover implementation requires at least one gallium driver.') endif - dep_clc = dependency('libclc') + with_clc = true with_gallium_opencl = true with_opencl_icd = _opencl == 'icd' else - dep_clc = null_dep with_gallium_opencl = false with_opencl_icd = false endif +dep_clc = null_dep +if with_clc + dep_clc = dependency('libclc') +endif + gl_pkgconfig_c_flags = [] if with_platform_x11 if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')