Skip to content

Commit 9fb5729

Browse files
committed
[build] disable vcpkg for Dawn temporarily
1 parent ac0195b commit 9fb5729

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

cmake/external/onnxruntime_external_deps.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,11 @@ endif()
625625

626626

627627
if (onnxruntime_USE_WEBGPU)
628-
if (onnxruntime_USE_VCPKG AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
628+
629+
# the following code is used to disable building Dawn using vcpkg temporarily
630+
# until we figure out how to resolve the packaging pipeline failures
631+
if (FALSE)
632+
# if (onnxruntime_USE_VCPKG AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
629633
# vcpkg does not support Emscripten yet
630634
find_package(dawn REQUIRED)
631635
else()
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
2+
index cdfde38819..c3d70edd05 100644
3+
--- a/third_party/CMakeLists.txt
4+
+++ b/third_party/CMakeLists.txt
5+
@@ -350,6 +350,7 @@ function(AddSubdirectoryDXC)
6+
add_custom_target(copy_dxil_dll)
7+
add_custom_command(
8+
TARGET copy_dxil_dll
9+
+ COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:dxcompiler>
10+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DXIL_DLL_PATH} $<TARGET_FILE_DIR:dxcompiler>
11+
COMMENT "Copying ${DXIL_DLL_PATH} to $<TARGET_FILE_DIR:dxcompiler>")
12+
# Make dxc target depend on copy_dxil_dll

0 commit comments

Comments
 (0)