do not use vcpkg for emscripten

Author: fs-eire

cmake/external/onnxruntime_external_deps.cmake

@@ -616,9 +616,13 @@ endif()
 
 
 if (onnxruntime_USE_WEBGPU)
-  if (onnxruntime_USE_VCPKG)
+  if (onnxruntime_USE_VCPKG AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # vcpkg does not support Emscripten yet
     find_package(dawn REQUIRED)
   else()
+    #
+    # Please keep the following in sync with cmake/vcpkg-ports/dawn/portfile.cmake
+    #
     set(DAWN_BUILD_SAMPLES OFF CACHE BOOL "" FORCE)
     set(DAWN_ENABLE_NULL OFF CACHE BOOL "" FORCE)
     set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "" FORCE)

cmake/vcpkg-ports/dawn/portfile.cmake

@@ -16,7 +16,7 @@
 # The following function call ensures BUILD_SHARED_LIBS is set to OFF.
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+if(VCPKG_TARGET_IS_EMSCRIPTEN)
     message(FATAL_ERROR "This port is currently not supported on Emscripten.")
 endif()
 
@@ -32,40 +32,44 @@ list(APPEND onnxruntime_vcpkg_DAWN_OPTIONS
 
     -DDAWN_BUILD_SAMPLES=OFF
     -DDAWN_ENABLE_NULL=OFF
-
     -DDAWN_BUILD_TESTS=OFF
-
-    -DDAWN_BUILD_MONOLITHIC_LIBRARY=ON
-    -DDAWN_ENABLE_INSTALL=ON
-
-    -DDAWN_ENABLE_DESKTOP_GL=OFF
-    -DDAWN_ENABLE_OPENGLES=OFF
-    -DDAWN_SUPPORTS_GLFW_FOR_WINDOWING=OFF
-    -DDAWN_USE_GLFW=OFF
-    -DDAWN_USE_WINDOWS_UI=OFF
-    -DTINT_BUILD_GLSL_WRITER=OFF
-    -DTINT_BUILD_GLSL_VALIDATOR=OFF
-
-    -DDAWN_DXC_ENABLE_ASSERTS_IN_NDEBUG=OFF
-    -DDAWN_USE_X11=OFF
-
-    -DTINT_BUILD_TESTS=OFF
-    -DTINT_BUILD_CMD_TOOLS=OFF
-    -DTINT_BUILD_IR_BINARY=OFF
-    -DTINT_BUILD_SPV_READER=OFF
-    -DTINT_BUILD_WGSL_WRITER=ON
-
-    -DDAWN_ENABLE_SPIRV_VALIDATION=OFF
-
-    # explicitly set the jinja2 and markupsafe directories to empty strings
-    # when they are empty, the python script will import them from the system
-    #
-    # pip install jinja2 markupsafe
-    #
-    -DDAWN_JINJA2_DIR=
-    -DDAWN_MARKUPSAFE_DIR=
 )
 
+if (NOT VCPKG_TARGET_IS_EMSCRIPTEN)
+    list(APPEND onnxruntime_vcpkg_DAWN_OPTIONS
+
+        -DDAWN_BUILD_MONOLITHIC_LIBRARY=ON
+        -DDAWN_ENABLE_INSTALL=ON
+
+        -DDAWN_ENABLE_DESKTOP_GL=OFF
+        -DDAWN_ENABLE_OPENGLES=OFF
+        -DDAWN_SUPPORTS_GLFW_FOR_WINDOWING=OFF
+        -DDAWN_USE_GLFW=OFF
+        -DDAWN_USE_WINDOWS_UI=OFF
+        -DTINT_BUILD_GLSL_WRITER=OFF
+        -DTINT_BUILD_GLSL_VALIDATOR=OFF
+
+        -DDAWN_DXC_ENABLE_ASSERTS_IN_NDEBUG=OFF
+        -DDAWN_USE_X11=OFF
+
+        -DTINT_BUILD_TESTS=OFF
+        -DTINT_BUILD_CMD_TOOLS=OFF
+        -DTINT_BUILD_IR_BINARY=OFF
+        -DTINT_BUILD_SPV_READER=OFF
+        -DTINT_BUILD_WGSL_WRITER=ON
+
+        -DDAWN_ENABLE_SPIRV_VALIDATION=OFF
+
+        # explicitly set the jinja2 and markupsafe directories to empty strings
+        # when they are empty, the python script will import them from the system
+        #
+        # pip install jinja2 markupsafe
+        #
+        -DDAWN_JINJA2_DIR=
+        -DDAWN_MARKUPSAFE_DIR=
+    )
+endif()
+
 if(VCPKG_TARGET_IS_WINDOWS)
     # feature detection on Windows
     vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

cmake/vcpkg.json

@@ -77,33 +77,23 @@
   "features": {
     "tests": {
       "description": "Build ONNXRuntime unit tests",
-      "dependencies": [
-        "gtest"
-      ]
+      "dependencies": ["gtest"]
     },
     "xnnpack-ep": {
       "description": "Build with XNNPack EP",
-      "dependencies": [
-        "xnnpack"
-      ]
+      "dependencies": ["xnnpack"]
     },
     "coreml-ep": {
       "description": "Build with CoreML EP",
-      "dependencies": [
-        "fp16"
-      ]
+      "dependencies": ["fp16"]
     },
     "dml-ep": {
-      "description": "Build with CoreML EP",
-      "dependencies": [
-        "directx-headers"
-      ]
+      "description": "Build with DirectML EP",
+      "dependencies": ["directx-headers"]
     },
     "webgpu-ep": {
       "description": "Build with WebGPU EP",
-      "dependencies": [
-        "dawn"
-      ]
+      "dependencies": [{ "name": "dawn", "platform": "!emscripten" }]
     }
   },
   "overrides": [