Merge pull request #537 from mmuetzel/elmergui

Fix building with VTK 9.3 or newer
ElmerCSC · Aug 27, 2024 · 45ac644 · 45ac644
2 parents 757916e + fd3f80e
commit 45ac644
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/build-windows-mingw.yaml b/.github/workflows/build-windows-mingw.yaml
@@ -63,8 +63,25 @@ jobs:
             msmpi:p
             openblas:p
             parmetis:p
-            qwt-qt5:p
-            qt5-script:p
+            qt6-declarative:p
+            qwt-qt6:p
+            vtk:p
+            adios2:p
+            boost:p
+            cgns:p
+            cli11:p
+            eigen3:p
+            fast_float:p
+            ffmpeg:p
+            gl2ps:p
+            liblas:p
+            libmariadbclient:p
+            openslide:p
+            openvdb:p
+            pdal:p
+            unixodbc:p
+            utf8cpp:p
+            opencascade:p
             ${{ matrix.umfpack-package }}
 
       - name: install MSMPI
@@ -94,6 +111,9 @@ jobs:
             -DParMetis_INCLUDE_DIR="$(pkg-config --cflags parmetis)" \
             -DWITH_Mumps=OFF \
             -DWITH_ELMERGUI=ON \
+            -DWITH_QT6=ON \
+            -DWITH_VTK=ON \
+            -DWITH_OCC=ON \
             -DWITH_PARAVIEW=ON \
             -DCREATE_PKGCONFIG_FILE=ON \
             ${{ matrix.umfpack-cmake-flags }} \

diff --git a/ElmerGUI/Application/cad/cadview.h b/ElmerGUI/Application/cad/cadview.h
@@ -58,7 +58,6 @@ namespace nglib {
 #include <BRepMesh_IncrementalMesh.hxx>
 #endif
 
-#include "vtkConfigure.h"
 #ifndef VTK_MAJOR_VERSION
 #include "vtkVersionMacros.h"
 #endif

diff --git a/ElmerGUI/Application/vtkpost/vtkpost.h b/ElmerGUI/Application/vtkpost/vtkpost.h
@@ -57,7 +57,6 @@
 #include <gui/PythonQtScriptingConsole.h>
 #endif
 
-#include "vtkConfigure.h"
 #ifndef VTK_MAJOR_VERSION
 #include "vtkVersionMacros.h"
 #endif