aboutsummaryrefslogtreecommitdiff
path: root/ports/hdf5
diff options
context:
space:
mode:
Diffstat (limited to 'ports/hdf5')
-rw-r--r--ports/hdf5/CONTROL24
-rw-r--r--ports/hdf5/portfile.cmake9
2 files changed, 15 insertions, 18 deletions
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL
index b22ee7b8e..18f03e487 100644
--- a/ports/hdf5/CONTROL
+++ b/ports/hdf5/CONTROL
@@ -1,12 +1,12 @@
-Source: hdf5
-Version: 1.10.5-6
-Homepage: https://www.hdfgroup.org/downloads/hdf5/
-Description: HDF5 is a data model, library, and file format for storing and managing data
-Build-Depends: zlib, szip
-
-Feature: parallel
-Description: parallel support for HDF5
-Build-Depends: msmpi
-
-Feature: cpp
-Description: Builds cpp lib
+Source: hdf5
+Version: 1.10.5-7
+Homepage: https://www.hdfgroup.org/downloads/hdf5/
+Description: HDF5 is a data model, library, and file format for storing and managing data
+Build-Depends: zlib, szip
+
+Feature: parallel
+Description: parallel support for HDF5
+Build-Depends: msmpi
+
+Feature: cpp
+Description: Builds cpp lib
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index 593b38abf..1a148c2c3 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -30,10 +30,8 @@ else()
set(ENABLE_CPP OFF)
endif()
-#Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
-
file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
@@ -54,10 +52,9 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/hdf5)
-
-#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best
+#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()