Module: Mesa
Branch: master
Commit: 0ce3f3538bd91d2568481f853a692b7711f9340d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ce3f3538bd91d2568481f853a692b7711f9340d
Author: Dylan Baker <dy...@pnwbakers.com>
Date: Thu Jun 7 11:22:48 2018 -0700
meson: Make use of optional modules
meson 0.43 gained support for optional modules, which clover wold like
to use. Since we require 0.44.1 now we can rely on them being available
for clover.
compile tested only.
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
Reviewed-by: Eric Engestrom <eric.engest...@intel.com>
Reviewed-by: Matt Turner <matts...@gmail.com>
---
meson.build | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 0fab01fe53..bee526a4f2 100644
--- a/meson.build
+++ b/meson.build
@@ -1110,6 +1110,7 @@ if dep_libdrm.found()
endif
llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
+llvm_optional_modules = []
if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
llvm_modules += ['amdgpu', 'bitreader', 'ipo']
if with_gallium_r600
@@ -1121,7 +1122,7 @@ if with_gallium_opencl
'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
'lto', 'option', 'objcarcopts', 'profiledata',
]
- # TODO: optional modules
+ llvm_optional_modules += ['coroutines', 'opencl']
endif
if with_amd_vk or with_gallium_radeonsi
@@ -1137,12 +1138,20 @@ endif
_llvm = get_option('llvm')
if _llvm == 'auto'
dep_llvm = dependency(
- 'llvm', version : _llvm_version, modules : llvm_modules,
+ 'llvm',
+ version : _llvm_version,
+ modules : llvm_modules,
+ optional_modules : llvm_optional_modules,
required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or
with_gallium_opencl,
)
with_llvm = dep_llvm.found()
elif _llvm == 'true'
- dep_llvm = dependency('llvm', version : _llvm_version, modules :
llvm_modules)
+ dep_llvm = dependency(
+ 'llvm',
+ version : _llvm_version,
+ modules : llvm_modules,
+ optional_modules : llvm_optional_modules,
+ )
with_llvm = true
else
dep_llvm = null_dep
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
