diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-07 11:22:48 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-13 10:06:58 -0700 |
| commit | 0ce3f3538bd91d2568481f853a692b7711f9340d (patch) | |
| tree | e51617419c6d2de9284baff6d2e43379fac146ca /meson.build | |
| parent | 34bbb24ce7702658cdc4e9d34a650e169716c39e (diff) | |
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.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 0fab01fe530..bee526a4f22 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 |