Mesa (master): clover: eliminate "ignoring attributes on template argument" warning

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 66456b8d49ba2ccfe36e3dd2d7dadefaae392636
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=66456b8d49ba2ccfe36e3dd2d7dadefaae392636

Author: Karol Herbst <kherbst at redhat.com>
Date:   Fri Sep 20 13:08:50 2019 +0200

clover: eliminate "ignoring attributes on template argument" warning

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Pierre Moreau <dev at pmoreau.org>

---

 src/gallium/state_trackers/clover/meson.build | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build
index 04c6f1ea0eb..6704f8567bb 100644
--- a/src/gallium/state_trackers/clover/meson.build
+++ b/src/gallium/state_trackers/clover/meson.build
@@ -22,6 +22,13 @@ clover_cpp_args = []
 clover_spirv_cpp_args = []
 clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux]
 
+# the CL header files declare attributes on the CL types. Compilers warn if
+# we use them as template arguments. Disable the warning as there isn't
+# anything we can do about it
+if cpp.has_argument('-Wno-ignored-attributes')
+   clover_cpp_args += '-Wno-ignored-attributes'
+endif
+
 if with_opencl_icd
   clover_cpp_args += '-DHAVE_CLOVER_ICD'
 endif
@@ -45,7 +52,9 @@ libclllvm = static_library(
   ),
   include_directories : clover_incs,
   cpp_args : [
-    clover_spirv_cpp_args, cpp_vis_args,
+    clover_cpp_args,
+    clover_spirv_cpp_args,
+    cpp_vis_args,
     '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')),
     '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')),
     '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(