Fix vtk:9 build and cmake target link

Signed-off-by: haawda <stefan-husmann@t-online.de>

3 files changed, 28 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37f31c80760f..d06c8b5b6860 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mmg
 	pkgdesc = Anisotropic tetrahedral remesher and moving mesh generator
 	pkgver = 5.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.mmgtools.org/
 	arch = i686
 	arch = x86_64
@@ -14,13 +14,17 @@ pkgbase = mmg
 	makedepends = python
 	makedepends = libogg
 	makedepends = libtheora
+	makedepends = fmt
+	makedepends = tbb
 	depends = scotch
+	depends = vtk
+	depends = pugixml
 	provides = mmg3d
 	conflicts = mmg3d
 	replaces = mmg3d
 	source = mmg-5.6.0.tar.gz::https://github.com/MmgTools/mmg/archive/v5.6.0.tar.gz
 	source = cmake.patch
 	sha256sums = bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437
-	sha256sums = 9716e5a64f577fdb08c25bc5d1eb73ff7bf32607e04719d78b247e4136bbcf15
+	sha256sums = 4cf49834fc11470ea61261706fd96d586e1082cae712a1c4f2cffac60c8b4bab
 
 pkgname = mmg
diff --git a/PKGBUILD b/PKGBUILD
index c7bb21545798..2a90bc0dd16d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 pkgname=mmg
 pkgver=5.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Anisotropic tetrahedral remesher and moving mesh generator'
 url="http://www.mmgtools.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('scotch')
-makedepends=('cmake' 'netcdf' 'proj' 'qt5-base' 'glew' 'python' 'libogg' 'libtheora')
+depends=('scotch' 'vtk' 'pugixml')
+makedepends=('cmake' 'netcdf' 'proj' 'qt5-base' 'glew' 'python' 'libogg' 'libtheora' 'fmt' 'tbb')
 provides=('mmg3d')
 conflicts=('mmg3d')
 replaces=('mmg3d')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/MmgTools/mmg/archive/v$pkgver.tar.gz"
 	cmake.patch)
 sha256sums=('bbf9163d65bc6e0f81dd3acc5a51e4a8c47a7fdae849abc26277e01154fe2437'
-            '9716e5a64f577fdb08c25bc5d1eb73ff7bf32607e04719d78b247e4136bbcf15')
+            '4cf49834fc11470ea61261706fd96d586e1082cae712a1c4f2cffac60c8b4bab')
 
 prepare () {
   cd "$pkgname-$pkgver"
@@ -27,7 +27,7 @@ build () {
     -DCMAKE_INSTALL_PREFIX="$pkgdir"/usr \
     -DBUILD_SHARED_LIBS=ON \
     -DUSE_ELAS=OFF \
-    -DUSE_VTK=OFF
+    -DUSE_VTK=ON
 
   cmake --build build
 }
diff --git a/cmake.patch b/cmake.patch
index fb5fbe66a5fb..f2fc0566d664 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -6,8 +6,23 @@ diff -Naur mmg-5.5.2/cmake/config/mmgConfig.cmake.in mmg-5.5.2.ne/cmake/config/m
  include(CMakeFindDependencyMacro)
  
 +# Allows us to use all .cmake files in this directory
-+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")
++list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}" "/usr/lib/cmake/OpenVDB")
 +
  find_package(SCOTCH)
- find_package(VTK)
+-find_package(VTK)
++find_package(VTK COMPONENTS IOParallel IOParallelXML)
  
+ if (NOT TARGET Mmg::mmg )
+   include(${CMAKE_CURRENT_LIST_DIR}/MmgTargets.cmake)
+diff -Naur mmg-5.6.0/CMakeLists.txt mmg-5.6.0.new/CMakeLists.txt
+--- mmg-5.6.0/CMakeLists.txt	2021-11-04 16:41:12.000000000 +0100
++++ mmg-5.6.0.new/CMakeLists.txt	2021-11-07 17:02:41.348954886 +0100
+@@ -288,7 +288,7 @@
+ # add the VTK library ?
+ OPTION ( USE_VTK "Use VTK I/O" ON )
+ IF ( USE_VTK )
+-  FIND_PACKAGE(VTK QUIET)
++  FIND_PACKAGE(VTK REQUIRED IOParallelXML IOParallel)
+   IF ( NOT VTK_FOUND )
+     MESSAGE ( WARNING "VTK library not found: vtk I/O will not be available.")
+   ENDIF ( )