Ci Uplifts

.cppcheck.supp

@@ -1,14 +1,12 @@
 // remove some checks
 missingInclude
 unusedFunction
+unknownMacro
 
 // external libraries
 *:external/nlohmann_json/nlohmann/json.hpp
 *:external/cxxopts/cxxopts.hpp
 
-// opencascade
-*:*opencascade/*.hxx
-
 // specific checks
 knownConditionTrueFalse:library/testing/TestSDKImage.cxx
 knownConditionTrueFalse:library/testing/TestSDKImageDeprecated.cxx

.github/actions/alembic-install-dep/action.yml

@@ -15,7 +15,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/alembic_install
-        key: alembic-v1.8.5-${{runner.os}}-${{inputs.cpu}}-0
+        key: alembic-v1.8.5-${{runner.os}}-${{inputs.cpu}}-1
 
     - name: Checkout Alembic
       if: steps.cache-alembic.outputs.cache-hit != 'true'

.github/actions/assimp-install-dep/action.yml

@@ -15,22 +15,15 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/assimp_install
-        key: assimp-v5.2.5-${{runner.os}}-${{inputs.cpu}}-0
+        key: assimp-v5.3.1-${{runner.os}}-${{inputs.cpu}}-0
 
     - name: Checkout ASSIMP
       if: steps.cache-assimp.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: assimp/assimp
         path: './dependencies/assimp'
-        ref: v5.2.5
-
-    # https://github.com/assimp/assimp/pull/5087
-    - name: Patch Assimp librt
-      if: steps.cache-assimp.outputs.cache-hit != 'true'
-      working-directory: ${{github.workspace}}/dependencies/assimp
-      shell: bash
-      run: patch -p1 < $GITHUB_ACTION_PATH/0001-Fix-librt-link.patch
+        ref: v5.3.1
 
     - name: Setup ASSIMP
       if: steps.cache-assimp.outputs.cache-hit != 'true'

.github/actions/imath-install-dep/action.yml

@@ -15,15 +15,15 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/imath_install
-        key: imath-v3.1.7-${{runner.os}}-${{inputs.cpu}}-0
+        key: imath-v3.1.9-${{runner.os}}-${{inputs.cpu}}-0
 
     - name: Checkout Imath
       if: steps.cache-imath.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: AcademySoftwareFoundation/Imath
         path: './dependencies/imath'
-        ref: v3.1.7
+        ref: v3.1.9
 
     - name: Setup Imath
       if: steps.cache-imath.outputs.cache-hit != 'true'

.github/actions/occt-install-dep/action.yml

@@ -15,7 +15,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/occt_install
-        key: occt-V7_6_3-${{runner.os}}-${{inputs.cpu}}-0
+        key: occt-V7_7_2-${{runner.os}}-${{inputs.cpu}}-1
 
     - name: Checkout OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
@@ -24,13 +24,16 @@ runs:
         repository: Open-Cascade-SAS/OCCT
         submodules: true
         path: './dependencies/occt'
-        ref: V7_6_3
+        ref: V7_7_2
 
-    - name: Patch OCCT INSTALL_RPATH
+    - name: Patch OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
       working-directory: ${{github.workspace}}/dependencies/occt
       shell: bash
-      run: patch -p1 < $GITHUB_ACTION_PATH/0001-Adding-INSTALL_RPATH-Linux.patch
+      run: |
+        patch -p1 < $GITHUB_ACTION_PATH/0001-Adding-INSTALL_RPATH-Linux.patch
+        patch -p1 < $GITHUB_ACTION_PATH/occt-remove-unneeded-includes.patch
+        patch -p1 < $GITHUB_ACTION_PATH/occt-remove-unneeded-quotes-warning-msvc.patch
 
     - name: Setup OCCT
       if: steps.cache-occt.outputs.cache-hit != 'true'
@@ -50,6 +53,7 @@ runs:
         -DBUILD_DOC_Overview=OFF
         -DBUILD_LIBRARY_TYPE=Shared
         -DBUILD_MODULE_ApplicationFramework=OFF
+        -DBUILD_MODULE_DETools=OFF
         -DBUILD_MODULE_DataExchange=OFF
         -DBUILD_MODULE_Draw=OFF
         -DBUILD_MODULE_FoundationClasses=OFF

.github/actions/occt-install-dep/occt-remove-unneeded-includes.patch

@@ -0,0 +1,37 @@
+From 169c8e90b3075a5775d5fbda38a7f74b824dea34 Mon Sep 17 00:00:00 2001
+From: Mathieu Westphal <mathieu.westphal@kitware.com>
+Date: Mon, 23 Oct 2023 03:55:23 +0800
+Subject: [PATCH] Remove unneeded includes
+
+---
+ src/IGESCAFControl/IGESCAFControl_Provider.cxx | 1 -
+ src/STEPCAFControl/STEPCAFControl_Provider.cxx | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/IGESCAFControl/IGESCAFControl_Provider.cxx b/src/IGESCAFControl/IGESCAFControl_Provider.cxx
+index f5c82fd3..ea908522 100644
+--- a/src/IGESCAFControl/IGESCAFControl_Provider.cxx
++++ b/src/IGESCAFControl/IGESCAFControl_Provider.cxx
+@@ -13,7 +13,6 @@
+
+ #include <IGESCAFControl_Provider.hxx>
+
+-#include <BinXCAFDrivers.hxx>
+ #include <IGESCAFControl_ConfigurationNode.hxx>
+ #include <IGESCAFControl_Reader.hxx>
+ #include <IGESCAFControl_Writer.hxx>
+diff --git a/src/STEPCAFControl/STEPCAFControl_Provider.cxx b/src/STEPCAFControl/STEPCAFControl_Provider.cxx
+index 6eb2db9f..e73f14fe 100644
+--- a/src/STEPCAFControl/STEPCAFControl_Provider.cxx
++++ b/src/STEPCAFControl/STEPCAFControl_Provider.cxx
+@@ -13,7 +13,6 @@
+
+ #include <STEPCAFControl_Provider.hxx>
+
+-#include <BinXCAFDrivers.hxx>
+ #include <Interface_Static.hxx>
+ #include <Message.hxx>
+ #include <StepData_StepModel.hxx>
+-- 
+2.42.0
+

.github/actions/occt-install-dep/occt-remove-unneeded-quotes-warning-msvc.patch

@@ -0,0 +1,25 @@
+From 2cae159acd7e4f2ba52422d0a750183fddf05b85 Mon Sep 17 00:00:00 2001
+From: Mathieu Westphal <mathieu.westphal@kitware.com>
+Date: Wed, 25 Oct 2023 08:18:51 +0200
+Subject: [PATCH] remove unneeded quotes warning msvc
+
+---
+ adm/cmake/occt_defs_flags.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
+index 33b50e8ce7..d942b40f22 100644
+--- a/adm/cmake/occt_defs_flags.cmake
++++ b/adm/cmake/occt_defs_flags.cmake
+@@ -26,7 +26,7 @@ endif()
+
+ if (MSVC)
+   # suppress C26812 on VS2019/C++20 (prefer 'enum class' over 'enum')
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd\"26812\"")
++  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:precise /wd26812")
+   # suppress warning on using portable non-secure functions in favor of non-portable secure ones
+   add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+ else()
+-- 
+2.42.0
+

.github/actions/openexr-install-dep/action.yml

@@ -15,15 +15,15 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/openexr_install
-        key: openexr-v3.1.8-${{runner.os}}-${{inputs.cpu}}-0
+        key: openexr-v3.2.1-${{runner.os}}-${{inputs.cpu}}-0
 
     - name: Checkout OpenEXR
       if: steps.cache-openexr.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: AcademySoftwareFoundation/openexr
         path: './dependencies/openexr'
-        ref: v3.1.8
+        ref: v3.2.1
 
     - name: Setup OpenEXR
       if: steps.cache-openexr.outputs.cache-hit != 'true'

.github/actions/pybind11-install-dep/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/pybind11_install
-        key: pybind11-v2.10.4-${{runner.os}}-0
+        key: pybind11-v2.11.1-${{runner.os}}-0
 
     - name: Checkout pybind11
       if: steps.cache-pybind11.outputs.cache-hit != 'true'
@@ -18,7 +18,7 @@ runs:
         repository: pybind/pybind11
         submodules: true
         path: './dependencies/pybind11'
-        ref: v2.10.4
+        ref: v2.11.1
 
     - name: Setup pybind11
       if: steps.cache-pybind11.outputs.cache-hit != 'true'

.github/actions/tbb-install-dep/action.yml

@@ -15,15 +15,15 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/tbb_install
-        key: tbb-v2021.9.0-${{runner.os}}-${{inputs.cpu}}-0
+        key: tbb-v2021.10.0-${{runner.os}}-${{inputs.cpu}}-0
 
     - name: Checkout TBB
       if: steps.cache-tbb.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: oneapi-src/oneTBB
         path: './dependencies/tbb'
-        ref: v2021.9.0
+        ref: v2021.10.0
 
     - name: Setup TBB
       if: steps.cache-tbb.outputs.cache-hit != 'true'

.github/actions/vtk-install-dep/action.yml

@@ -47,7 +47,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: dependencies/vtk_install
-        key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.egl_label}}-${{inputs.cpu}}-1
+        key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.egl_label}}-${{inputs.cpu}}-4
 
     - name: Setup VTK
       if: steps.cache-vtk.outputs.cache-hit != 'true'

library/src/interactor_impl.cxx

@@ -540,8 +540,6 @@ class interactor_impl::internals
   vtkNew<vtkRenderWindowInteractor> VTKInteractor;
   vtkNew<vtkF3DInteractorStyle> Style;
   vtkSmartPointer<vtkF3DInteractorEventRecorder> Recorder;
-  int WindowSize[2] = { -1, -1 };
-  int WindowPos[2] = { 0, 0 };
   std::map<unsigned long, std::pair<int, std::function<void()> > > TimerCallBacks;
 
   vtkNew<vtkCellPicker> CellPicker;

plugins/occt/module/vtkF3DOCCTReader.cxx

@@ -19,6 +19,7 @@
 #include <Poly_Triangulation.hxx>
 #include <Quantity_Color.hxx>
 #include <STEPControl_Reader.hxx>
+#include <Standard_Handle.hxx>
 #include <Standard_PrimitiveTypes.hxx>
 #include <Storage_StreamTypeMismatchError.hxx>
 #include <TColgp_Array1OfVec.hxx>