encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add spvtools deps to top-level targets 

Dawn has issues with building tint targets without these specified. Putting them
in public_deps doesn't resolve the linking issue.

Change-Id: Ib99f2d4a74cbb3a33c0aa9e47e5eb788ef01a7e8
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/21280
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
Ryan Harrison 2020-05-07 17:17:15 +00:00 committed by dan sinclair
parent ace7a13662
commit 1f1f08f94a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BUILD.gn
View File

@ -399,6 +399,7 @@ source_set("libtint_spv_reader_src") {
":tint_core_tables_unified1", ":tint_core_tables_unified1",
":tint_language_header_cldebuginfo100", ":tint_language_header_cldebuginfo100",
":tint_language_header_debuginfo", ":tint_language_header_debuginfo",
"${tint_spirv_tools_dir}/:spvtools",
"${tint_spirv_tools_dir}/:spvtools_opt", "${tint_spirv_tools_dir}/:spvtools_opt",
"${tint_spirv_tools_dir}/:spvtools_val", "${tint_spirv_tools_dir}/:spvtools_val",
] ]
@ -883,6 +884,9 @@ test("tint_unittests") {
":gmock_and_gtest", ":gmock_and_gtest",
":libtint", ":libtint",
":tint_unittests_src", ":tint_unittests_src",
"${tint_spirv_tools_dir}/:spvtools",
"${tint_spirv_tools_dir}/:spvtools_opt",
"${tint_spirv_tools_dir}/:spvtools_val",
] ]
# TODO(rharrison): Use main() from chromium for chromium tree builds. This # TODO(rharrison): Use main() from chromium for chromium tree builds. This
@ -919,6 +923,9 @@ if (build_with_chromium) {
deps = [ deps = [
":libtint", ":libtint",
":tint_wgsl_reader_fuzzer_src", ":tint_wgsl_reader_fuzzer_src",
"${tint_spirv_tools_dir}/:spvtools",
"${tint_spirv_tools_dir}/:spvtools_opt",
"${tint_spirv_tools_dir}/:spvtools_val",
] ]
} }
} }
@ -936,7 +943,12 @@ config("tint_exe_config") {
executable("tint_exe") { executable("tint_exe") {
sources = [ "samples/main.cc" ] sources = [ "samples/main.cc" ]
deps = [ ":libtint" ] deps = [
":libtint",
"${tint_spirv_tools_dir}/:spvtools",
"${tint_spirv_tools_dir}/:spvtools_opt",
"${tint_spirv_tools_dir}/:spvtools_val",
]
if (tint_build_spv_reader || tint_build_spv_writer) { if (tint_build_spv_reader || tint_build_spv_writer) {
deps += [ "${tint_spirv_headers_dir}/:spv_headers" ] deps += [ "${tint_spirv_headers_dir}/:spv_headers" ]