mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-07 05:36:04 +00:00
Use $windows_sdk_version instead of constant
Dawn was using a hard-coded constant for the Windows SDK version number but that makes upgrading the Windows SDK to build Chromium impossible. This change uses the newly created $windows_sdk_version to solve this problem. This new variable was added in crrev.com/c/4234366 Bug: tint:1719 Change-Id: I6a9f74f542d3517c046d74178a41e1e4d5887e7f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/119340 Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Kai Ninomiya <kainino@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
parent
1ace49c886
commit
0755fdbc8f
@ -127,18 +127,19 @@ if (build_with_chromium && is_win &&
|
||||
# The windows_sdk_path is acquired in visual_studio_version.gni.
|
||||
import("//build/config/win/visual_studio_version.gni")
|
||||
|
||||
# Windows 10 SDK version 10.0.20348.0 is required for building Chromium, and
|
||||
# it provided DXC compiler and validator both of v1.6.
|
||||
# Windows 10 SDK version 10.0.20348.0 provides DXC compiler and validator both
|
||||
# of v1.6 and Chromium builds require this SDK version or higher.
|
||||
assert(defined(windows_sdk_path))
|
||||
assert(defined(windows_sdk_version))
|
||||
assert(windows_sdk_path != "")
|
||||
|
||||
# Declare a copy target to copy DXC binary from Windows SDK for running Dawn
|
||||
# end-to-end test in Chromium.
|
||||
copy("copy_dxc_binary") {
|
||||
sources = [
|
||||
"$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxc.exe",
|
||||
"$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxcompiler.dll",
|
||||
"$windows_sdk_path/bin/10.0.20348.0/$target_cpu/dxil.dll",
|
||||
"$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxc.exe",
|
||||
"$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxcompiler.dll",
|
||||
"$windows_sdk_path/bin/$windows_sdk_version/$target_cpu/dxil.dll",
|
||||
]
|
||||
|
||||
outputs = [ "$root_out_dir/{{source_file_part}}" ]
|
||||
|
Loading…
x
Reference in New Issue
Block a user