diff --git a/.github/actions/vtk-webassembly-install-dep/0001-fix-js-install.patch b/.github/actions/vtk-webassembly-install-dep/0001-fix-js-install.patch deleted file mode 100644 index f70f448a27..0000000000 --- a/.github/actions/vtk-webassembly-install-dep/0001-fix-js-install.patch +++ /dev/null @@ -1,32 +0,0 @@ -From be296aee0648c279d83e3eaf09835684c6e67731 Mon Sep 17 00:00:00 2001 -From: Jaswant Panchumarti -Date: Wed, 29 May 2024 19:33:08 -0400 -Subject: [PATCH] Install JS library files in vtk.wasm - -- closes https://gitlab.kitware.com/vtk/vtk/-/issues/19356 -- Provides the .js files in both build and install interface. -- This fixes the use case where someone links to an installed VTK, -rather than doing so from the buildsystem. ---- - Rendering/UI/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Rendering/UI/CMakeLists.txt b/Rendering/UI/CMakeLists.txt -index e18a1639b61..9e132569198 100644 ---- a/Rendering/UI/CMakeLists.txt -+++ b/Rendering/UI/CMakeLists.txt -@@ -114,7 +114,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") - else () - vtk_module_link_options(VTK::RenderingUI - INTERFACE -- "--js-library=${CMAKE_CURRENT_SOURCE_DIR}/vtkWebAssemblyRenderWindowInteractor.js") -+ "$" -+ "$/lib/vtkWebAssemblyRenderWindowInteractor.js>") -+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/vtkWebAssemblyRenderWindowInteractor.js" -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif () - endif () - --- -GitLab - diff --git a/.github/actions/vtk-webassembly-install-dep/action.yml b/.github/actions/vtk-webassembly-install-dep/action.yml index be9181da68..679e21972a 100644 --- a/.github/actions/vtk-webassembly-install-dep/action.yml +++ b/.github/actions/vtk-webassembly-install-dep/action.yml @@ -35,7 +35,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/vtk_install - key: vtk-webassembly-${{env.VTK_SHA_OR_TAG}}-7 + key: vtk-webassembly-${{env.VTK_SHA_OR_TAG}}-1 - name: Setup VTK if: steps.cache-vtk.outputs.cache-hit != 'true' @@ -52,14 +52,6 @@ runs: path: './dependencies/vtk' ref: ${{env.VTK_SHA_OR_TAG}} - # Note that it's a bug in VTK and this step should be removed when fixed - # See https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11178 - - name: Patch js file install - if: steps.cache-vtk.outputs.cache-hit != 'true' - working-directory: ${{github.workspace}}/dependencies/vtk - shell: bash - run: patch -p1 < $GITHUB_ACTION_PATH/0001-fix-js-install.patch - - name: Configure VTK if: steps.cache-vtk.outputs.cache-hit != 'true' working-directory: ${{github.workspace}}/dependencies/vtk_build diff --git a/.github/actions/vtk_commit_sha b/.github/actions/vtk_commit_sha index 4f87d061c0..aede8f00ab 100644 --- a/.github/actions/vtk_commit_sha +++ b/.github/actions/vtk_commit_sha @@ -1 +1 @@ -63a4642a4274edb24b0e7ae8b73fd19b3f4aaa33 +7e954a92fba020b160a07420403248f6be87f2b0 diff --git a/doc/dev/BUILD_WASM.md b/doc/dev/BUILD_WASM.md index 0912da950c..f7bb53939a 100644 --- a/doc/dev/BUILD_WASM.md +++ b/doc/dev/BUILD_WASM.md @@ -19,6 +19,7 @@ docker pull dockcross/web-wasm:20240529-0dade71 ``` Clone VTK and F3D, it will be assumed that the source code is located in `$VTK_DIR` and `$F3D_DIR` variables in the next steps of this guide. +It's recommended to use VTK commit `7e954a92fba020b160a07420403248f6be87f2b0` which has been tested to work properly. ## Building VTK