Remove external module

f3d-app · Nov 19, 2024 · 01f2e6c · 01f2e6c
1 parent 64d0fd3
commit 01f2e6c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/.github/actions/wheels/action.yml b/.github/actions/wheels/action.yml
@@ -77,7 +77,7 @@ runs:
     shell: bash
     run: |
       echo "CMAKE_PREFIX_PATH=../fsbb/install" >> $GITHUB_ENV
-      echo "SKBUILD_CMAKE_ARGS=-DF3D_DEPENDENCIES_DIR=${{ env.ESCAPED_WS }}/fsbb/install/bin;-DF3D_PLUGIN_BUILD_ALEMBIC=ON;-DF3D_PLUGIN_BUILD_ASSIMP=ON;-DF3D_PLUGIN_BUILD_DRACO=ON;-DF3D_PLUGIN_BUILD_OCCT=ON;-DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;-DF3D_MODULE_EXR=ON;-DF3D_MODULE_EXTERNAL_RENDERING=ON;-DF3D_WINDOWS_GUI=OFF;-DF3D_MACOS_BUNDLE=OFF" >> $GITHUB_ENV
+      echo "SKBUILD_CMAKE_ARGS=-DF3D_DEPENDENCIES_DIR=${{ env.ESCAPED_WS }}/fsbb/install/bin;-DF3D_PLUGIN_BUILD_ALEMBIC=ON;-DF3D_PLUGIN_BUILD_ASSIMP=ON;-DF3D_PLUGIN_BUILD_DRACO=ON;-DF3D_PLUGIN_BUILD_OCCT=ON;-DF3D_PLUGIN_OCCT_COLORING_SUPPORT=ON;-DF3D_MODULE_EXR=ON;-DF3D_WINDOWS_GUI=OFF;-DF3D_MACOS_BUNDLE=OFF" >> $GITHUB_ENV
 
   - name: Build superbuild and wheels
     if: |

diff --git a/projects/f3d.cmake b/projects/f3d.cmake
@@ -27,7 +27,6 @@ superbuild_add_project(f3d
     -DF3D_LINUX_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX:BOOL=${f3d_build_for_linux}
     -DF3D_MACOS_BUNDLE:BOOL=${f3d_build_for_macos}
     -DF3D_MODULE_EXR:BOOL=${openexr_enabled}
-    -DF3D_MODULE_EXTERNAL_RENDERING:BOOL=ON
     -DF3D_MODULE_RAYTRACING:BOOL=${ospray_enabled}
     -DF3D_PLUGINS_STATIC_BUILD:BOOL=ON
     -DF3D_PLUGIN_BUILD_ALEMBIC:BOOL=${alembic_enabled}

diff --git a/projects/vtk.cmake b/projects/vtk.cmake
@@ -65,7 +65,6 @@ superbuild_add_project(vtk
     -DVTK_MODULE_ENABLE_VTK_InteractionWidgets:STRING=YES
     -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation:STRING=YES
     -DVTK_MODULE_ENABLE_VTK_RenderingCore:STRING=YES
-    -DVTK_MODULE_ENABLE_VTK_RenderingExternal:STRING=YES
     -DVTK_MODULE_ENABLE_VTK_RenderingLabel:STRING=YES
     -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2:STRING=YES
     -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing:STRING=${vtk_raytracing_enabled}

diff --git a/testing/sdk/test_engine/CMakeLists.txt b/testing/sdk/test_engine/CMakeLists.txt
@@ -14,7 +14,6 @@ endfunction()
 
 check_variable_defined(f3d_BINDINGS_JAVA)
 check_variable_defined(f3d_BINDINGS_PYTHON)
-check_variable_defined(f3d_MODULE_EXTERNAL_RENDERING)
 check_variable_defined(f3d_MODULE_RAYTRACING)
 
 add_executable(test_engine main.cxx)