From 01f2e6c2e9e5e8a2bfcbaee2f169a7516fbabc0f Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 Nov 2024 11:46:40 +0100 Subject: [PATCH] Remove external module --- .github/actions/wheels/action.yml | 2 +- projects/f3d.cmake | 1 - projects/vtk.cmake | 1 - testing/sdk/test_engine/CMakeLists.txt | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/wheels/action.yml b/.github/actions/wheels/action.yml index f404aeb1..61be00f9 100644 --- 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 index a990cde6..071171d0 100644 --- 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 index e11a3519..4c0c4989 100644 --- 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 index ebe5f6c3..bd06a36f 100644 --- 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)