2 files changed, 16 insertions, 20 deletions
diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL
index b22ee7b8e..542062c50 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-8
+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: mpi
+
+Feature: cpp
+Description: Builds cpp lib
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index 593b38abf..2be080335 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -16,7 +16,6 @@ vcpkg_extract_source_archive_ex(
     PATCHES
         hdf5_config.patch
 )
-set(SOURCE_PATH ${SOURCE_PATH}/hdf5-1.10.5)
 
 if ("parallel" IN_LIST FEATURES)
     set(ENABLE_PARALLEL ON)
@@ -30,12 +29,10 @@ 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
 
-file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH ${SOURCE_PATH}/hdf5-1.10.5
     DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
@@ -54,10 +51,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()