OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clover: eliminate "ignoring attributes on template argument" warning

Browse Source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Pierre Moreau <dev@pmoreau.org>
This commit is contained in:
Karol Herbst
2019-09-20 13:08:50 +02:00
committed by Karol Herbst
parent 4f044c38e2
commit 66456b8d49
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/state_trackers/clover/meson.build
View File

@@ -22,6 +22,13 @@ clover_cpp_args = []
clover_spirv_cpp_args = [] clover_spirv_cpp_args = []
clover_incs = [inc_include, inc_src, inc_gallium, inc_gallium_aux] 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 if with_opencl_icd
clover_cpp_args += '-DHAVE_CLOVER_ICD' clover_cpp_args += '-DHAVE_CLOVER_ICD'
endif endif
@@ -45,7 +52,9 @@ libclllvm = static_library(
), ),
include_directories : clover_incs, include_directories : clover_incs,
cpp_args : [ 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_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')),
'-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')),
'-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(