diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2022-03-18 14:05:05 -0700 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-03-21 16:58:14 +0000 |
| commit | fe65c5671b6cee094b9c2d177bc2bfae9729f827 (patch) | |
| tree | 5cf39b0e8066baba36e65b210e73ebee9e0c6d7d | |
| parent | 19db6b760aa3dd1ce510e80e5567992d955cd067 (diff) | |
gallium/opencl: set OCL_ICD_FILENAMES with devenv
So that `meson devenv` also sets up OpenCL.
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15471>
| -rw-r--r-- | src/gallium/targets/opencl/meson.build | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index ec65fcbe18e..14df6b86f7f 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -114,4 +114,12 @@ if with_opencl_icd install : true, install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) + + if meson.version().version_compare('>= 0.58') + # .so is hardcoded in the icd as well + devenv.prepend( + 'OCL_ICD_FILENAMES', + meson.current_build_dir() / 'libMesaOpenCL.so.@0@'.format(opencl_version) + ) + endif endif |