Merge pull request #542 from mmuetzel/elmergui-2

Explicitly instantiate VTK class template to work around error on Windows/MinGW
ElmerCSC · Aug 28, 2024 · fe5423b · fe5423b
2 parents 7b74eda + 0ff82cb
commit fe5423b
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 100 deletions.
diff --git a/.github/workflows/build-windows-mingw.yaml b/.github/workflows/build-windows-mingw.yaml
@@ -114,6 +114,7 @@ jobs:
             -DWITH_QT6=ON \
             -DWITH_VTK=ON \
             -DWITH_OCC=ON \
+            -DWITH_MATC=ON \
             -DWITH_PARAVIEW=ON \
             -DCREATE_PKGCONFIG_FILE=ON \
             ${{ matrix.umfpack-cmake-flags }} \

diff --git a/ElmerGUI/Application/CMakeLists.txt b/ElmerGUI/Application/CMakeLists.txt
@@ -112,7 +112,9 @@ ENDIF(WITH_QWT)
 IF(WITH_VTK AND NOT WITHOUT_VTKPOST)
   ADD_DEFINITIONS(-DEG_VTK)
   #FIND_PACKAGE(VTK REQUIRED)
-  INCLUDE(${VTK_USE_FILE})
+  IF(${VTK_VERSION} VERSION_LESS 8.90)
+    INCLUDE(${VTK_USE_FILE})
+  ENDIF()
   SET(HEADERS ${HEADERS}
     vtkpost/axes.h 
     vtkpost/featureedge.h 
@@ -253,6 +255,9 @@ IF(WITH_VTK)
   IF(VTK_MAJOR_VERSION VERSION_LESS 6)
     TARGET_LINK_LIBRARIES(ElmerGUI QVTK)
   ENDIF()
+  IF(ELMER_INSTANTIATE_VTK_ARRAY_TEMPLATE)
+    TARGET_COMPILE_DEFINITIONS(ElmerGUI PRIVATE ELMER_INSTANTIATE_VTK_ARRAY_TEMPLATE)
+  ENDIF()
 ENDIF()
 
 IF(WITH_OCC)