Make ORT and Dawn use the same protobuf/abseil source code (#23447)

### Description Make ORT and Dawn use the same protobuf/abseil source code
microsoft · Jan 22, 2025 · 368e243 · 368e243
1 parent 628c0e0
commit 368e243
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake
@@ -32,7 +32,13 @@ FetchContent_Declare(
 
 onnxruntime_fetchcontent_makeavailable(abseil_cpp)
 FetchContent_GetProperties(abseil_cpp)
-set(ABSEIL_SOURCE_DIR ${abseil_cpp_SOURCE_DIR})
+if(abseil_cpp_SOURCE_DIR)
+  set(ABSEIL_SOURCE_DIR ${abseil_cpp_SOURCE_DIR})
+  if(onnxruntime_USE_WEBGPU)
+    set(DAWN_ABSEIL_DIR ${abseil_cpp_SOURCE_DIR})
+  endif()
+endif()
+
 # abseil_cpp_SOURCE_DIR is non-empty if we build it from source
 message(STATUS "Abseil source dir:" ${ABSEIL_SOURCE_DIR})
 # abseil_cpp_VERSION  is non-empty if we find a preinstalled ABSL

diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake
@@ -222,6 +222,11 @@ onnxruntime_fetchcontent_makeavailable(Protobuf)
 if(Protobuf_FOUND)
   message(STATUS "Protobuf version: ${Protobuf_VERSION}")
 else()
+  if(protobuf_SOURCE_DIR)
+    if(onnxruntime_USE_WEBGPU)
+      set(DAWN_PROTOBUF_DIR ${protobuf_SOURCE_DIR})
+    endif()
+  endif()
   # Adjust warning flags
   if (TARGET libprotoc)
     if (NOT MSVC)