Merge branch 'master' into qt5_modular

4 files changed, 32 insertions, 28 deletions

diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 3919619ef..8b9ae8f6b 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.0.1-5
+Version: 8.1.0-1
 Description: Software system for 3D computer graphics, image processing, and visualization
 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
 
@@ -13,7 +13,7 @@ Build-Depends: qt5
 
 Feature: mpi
 Description: MPI functionality for VTK
-Build-Depends: msmpi
+Build-Depends: msmpi, hdf5[parallel]
 
 Feature: python
 Description: Python functionality for VTK
diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake
index 4a8c4a166..f3c6bd30f 100644
--- a/ports/vtk/FindHDF5.cmake
+++ b/ports/vtk/FindHDF5.cmake
@@ -2,22 +2,26 @@ find_package(HDF5 NO_MODULE REQUIRED)
 

 set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})

 

-add_library(vtk::hdf5::hdf5 INTERFACE IMPORTED GLOBAL)

-if(TARGET hdf5-static)

-    set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5-static")

-elseif(TARGET hdf5-shared)

-    set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5-shared")

-else()

-    message(FATAL_ERROR "could not find target hdf5-*")

+if(NOT TARGET vtk::hdf5::hdf5)

+    add_library(vtk::hdf5::hdf5 INTERFACE IMPORTED GLOBAL)

+    if(TARGET hdf5::hdf5-static)

+        set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static")

+    elseif(TARGET hdf5::hdf5-shared)

+        set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared")

+    else()

+        message(FATAL_ERROR "could not find target hdf5-*")

+    endif()

 endif()

 

-add_library(vtk::hdf5::hdf5_hl INTERFACE IMPORTED GLOBAL)

-if(TARGET hdf5_hl-static)

-    set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5_hl-static")

-elseif(TARGET hdf5_hl-shared)

-    set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5_hl-shared")

-else()

-    message(FATAL_ERROR "could not find target hdf5_hl-*")

+if(NOT TARGET vtk::hdf5::hdf5_hl)

+    add_library(vtk::hdf5::hdf5_hl INTERFACE IMPORTED GLOBAL)

+    if(TARGET hdf5::hdf5_hl-static)

+        set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-static")

+    elseif(TARGET hdf5::hdf5_hl-shared)

+        set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-shared")

+    else()

+        message(FATAL_ERROR "could not find target hdf5_hl-*")

+    endif()

 endif()

 

 set(HDF5_LIBRARIES "$<BUILD_INTERFACE:vtk::hdf5::hdf5>" "$<BUILD_INTERFACE:vtk::hdf5::hdf5_hl>")

diff --git a/ports/vtk/fix-find-libharu.patch b/ports/vtk/fix-find-libharu.patch
index 683f7bae6..1c66408c6 100644
--- a/ports/vtk/fix-find-libharu.patch
+++ b/ports/vtk/fix-find-libharu.patch
@@ -4,7 +4,7 @@
  
  find_path(LIBHARU_INCLUDE_DIR hpdf.h)
  
--find_library(LIBHARU_LIBRARY NAMES hpdf)
+-find_library(LIBHARU_LIBRARY NAMES hpdf hpdfs)
 +find_library(LIBHARU_LIBRARY_RELEASE NAMES hpdf libhpdf)
 +find_library(LIBHARU_LIBRARY_DEBUG NAMES hpdfd libhpdfd)
  
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index f46b47cbf..be344f8bf 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -1,39 +1,39 @@
 include(vcpkg_common_functions)
 
-set(VTK_SHORT_VERSION "8.0")
-set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.1")
+set(VTK_SHORT_VERSION "8.1")
+set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "Kitware/VTK"
     REF "v${VTK_LONG_VERSION}"
-    SHA512 3a70fa704d791d21a1e2421e6799ccc8238da5bc1fc0ab1925fb7956ccaebb7748c452faba1e7f4a2eafbc8612ed644f46f84b0cb3fe16ce539a823165feb29f
+    SHA512 09e110cba4ad9a6684e9b2af0cbb5b9053e3596ccb62aab96cd9e71aa4a96c809d96e13153ff44c28ad83015a61ba5195f7d34056707b62654c1bc057f9b9edf
     HEAD_REF "master"
 )
 
 # =============================================================================
-# Options: These should be set by feature-packages when they become available
+# Options:
 
 if ("qt" IN_LIST FEATURES)
-    set(VTK_WITH_QT                      ON ) # IMPORTANT: if ON make sure `qt5` is listed as dependency in the CONTROL file
+    set(VTK_WITH_QT                      ON )
 else()
-    set(VTK_WITH_QT                      OFF ) # IMPORTANT: if ON make sure `qt5` is listed as dependency in the CONTROL file
+    set(VTK_WITH_QT                      OFF )
 endif()
 
 if ("mpi" IN_LIST FEATURES)
-    set(VTK_WITH_MPI                     ON ) # IMPORTANT: if ON make sure `mpi` is listed as dependency in the CONTROL file
+    set(VTK_WITH_MPI                     ON )
 else()
-    set(VTK_WITH_MPI                     OFF ) # IMPORTANT: if ON make sure `mpi` is listed as dependency in the CONTROL file
+    set(VTK_WITH_MPI                     OFF )
 endif()
 
 if ("python" IN_LIST FEATURES)
-    set(VTK_WITH_PYTHON                  ON) # IMPORTANT: if ON make sure `python3` is listed as dependency in the CONTROL file
+    set(VTK_WITH_PYTHON                  ON)
 else()
-    set(VTK_WITH_PYTHON                  OFF) # IMPORTANT: if ON make sure `python3` is listed as dependency in the CONTROL file
+    set(VTK_WITH_PYTHON                  OFF)
 endif()
 
 if("openvr" IN_LIST FEATURES)
-    set(VTK_WITH_OPENVR                  ON) # IMPORTANT: if ON make sure `OpenVR` is listed as dependency in the CONTROL file
+    set(VTK_WITH_OPENVR                  ON)
 else()
     set(VTK_WITH_OPENVR                  OFF)
 endif()