[vtk:9.1] fix targets defined in disjointed scopes

check: https://gitlab.kitware.com/cmake/cmake/-/issues/22919

3 files changed, 42 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 301d4a1b861a..cf4a948c4234 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -40,11 +40,13 @@ pkgbase = elmerfem-git
 	source = elmerfem.desktop
 	source = arpack.patch
 	source = print_target_properties.patch
+	source = vtk9.cmake.patch
 	source = FindMMG.patch
 	sha256sums = SKIP
 	sha256sums = f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca
 	sha256sums = 04e73a99d7e8d501a2c7c5211a83257137a30a8b1b5c2f7c7ff6304e0e0a6da9
 	sha256sums = 97dae953c0c43bcd265dd141cec8b22912c3ae6808ed60782b84dde90468ebbd
+	sha256sums = d4cf395c1fe689b9f2802c1b5d53bec6553342ed018245446b229a1a14a6fd38
 	sha256sums = 89b0e79ca1ad8952839d0578cdbce86ea4dad46e3c68aa1ce5b8b83bcff94e57
 
 pkgname = elmerfem-git
diff --git a/PKGBUILD b/PKGBUILD
index 6a1f2cebcef8..c6262be43d27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -54,12 +54,14 @@ source=("git+https://github.com/ElmerCSC/elmerfem.git${_fragment}"
         "$_pkgname.desktop"
         "arpack.patch"
         "print_target_properties.patch"
+        "vtk9.cmake.patch"
         "FindMMG.patch")
 
 sha256sums=('SKIP'
             'f4b39389e5f258c7860b8d7a6b171fb54bf849dc772f640ac5e7a12c7a384aca'
             '04e73a99d7e8d501a2c7c5211a83257137a30a8b1b5c2f7c7ff6304e0e0a6da9'
             '97dae953c0c43bcd265dd141cec8b22912c3ae6808ed60782b84dde90468ebbd'
+            'd4cf395c1fe689b9f2802c1b5d53bec6553342ed018245446b229a1a14a6fd38'
             '89b0e79ca1ad8952839d0578cdbce86ea4dad46e3c68aa1ce5b8b83bcff94e57')
 
 pkgver() {
@@ -70,7 +72,7 @@ prepare() {
   cd "$srcdir/$_pkgname"
   sed -i 's/1 depth/1 ${depth}/g' fem/tests/CMakeLists.txt
   sed -i 's/FALSE/false/g' ElmerGUI/Application/vtkpost/matc.cpp
-  git apply -v "${srcdir}"/{arpack,FindMMG,print_target_properties}.patch
+  git apply -v "${srcdir}"/{arpack,FindMMG,print_target_properties,vtk9.cmake}.patch
 }
 
 build() {
diff --git a/vtk9.cmake.patch b/vtk9.cmake.patch
new file mode 100644
index 000000000000..fcaaa523b260
--- /dev/null
+++ b/vtk9.cmake.patch
@@ -0,0 +1,37 @@
+diff --git a/ElmerGUI/CMakeLists.txt b/ElmerGUI/CMakeLists.txt
+index 8b520162..68b0a6c3 100644
+--- a/ElmerGUI/CMakeLists.txt
++++ b/ElmerGUI/CMakeLists.txt
+@@ -90,7 +90,7 @@ ENDIF()
+ 
+ IF(WITH_VTK)
+   # ADD_DEFINITIONS(-DEG_VTK)
+-  FIND_PACKAGE(VTK REQUIRED)
++  FIND_PACKAGE(VTK REQUIRED ViewsQt FiltersParallel RenderingAnnotation RenderingFreeType IOXML IOImage FiltersParallelFlowPaths)
+   INCLUDE(${VTK_USE_FILE})
+   MESSAGE(STATUS "  [ElmerGUI] VTK version:       " ${VTK_VERSION})
+   MESSAGE(STATUS "  [ElmerGUI] VTK_LIBS:          " "${VTK_LIBRARIES}")
+diff --git a/ElmerGUI/Application/CMakeLists.txt b/ElmerGUI/Application/CMakeLists.txt
+index 9ba8dee1..74dd5ddb 100644
+--- a/ElmerGUI/Application/CMakeLists.txt
++++ b/ElmerGUI/Application/CMakeLists.txt
+@@ -243,6 +244,7 @@ ENDIF()
+ 
+ IF(WITH_VTK)
+   TARGET_LINK_LIBRARIES(ElmerGUI ${VTK_LIBRARIES})
++  print_target_properties(${VTK_LIBRARIES})
+   IF(VTK_MAJOR_VERSION VERSION_LESS 6)
+     TARGET_LINK_LIBRARIES(ElmerGUI QVTK)
+   ENDIF()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b8d2abc..e552ece4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -364,6 +364,7 @@ ENDIF(WITH_Zoltan)
+ MESSAGE(STATUS "------------------------------------------------")
+ MESSAGE(STATUS "Mesh adaptation 2D/3D looking for [Mmg] tools ")
+ 
++FIND_PACKAGE(VTK REQUIRED ViewsQt)
+ FIND_PACKAGE(MMG)
+ # INCLUDE("cmake/Modules/FindMMG.cmake")
+ # INCLUDE_DIRECTORIES(${MMG_INCLUDE_DIR})