From 7844dedfcb56de2e7ba230ef33fa389851e3f767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sat, 11 Jan 2020 07:44:54 +0800
Subject: [ismrmrd]Upgrade to 1.4.1 (#8880)

---
 ports/ismrmrd/CONTROL                |  2 +-
 ports/ismrmrd/fix-depends-hdf5.patch | 17 +++++++++++++++++
 ports/ismrmrd/portfile.cmake         | 11 +++++------
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 ports/ismrmrd/fix-depends-hdf5.patch

diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL
index f876416d4..d35ea2dae 100644
--- a/ports/ismrmrd/CONTROL
+++ b/ports/ismrmrd/CONTROL
@@ -1,4 +1,4 @@
 Source: ismrmrd
-Version: 1.4.0-1
+Version: 1.4.1
 Description: ISMRM Raw Data Format
 Build-Depends: pugixml, hdf5, boost, fftw3
diff --git a/ports/ismrmrd/fix-depends-hdf5.patch b/ports/ismrmrd/fix-depends-hdf5.patch
new file mode 100644
index 000000000..26b01de48
--- /dev/null
+++ b/ports/ismrmrd/fix-depends-hdf5.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2144fd3..68f9ca9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,11 @@ endif()
+ if (USE_HDF5_DATASET_SUPPORT)
+     if (VCPKG_TARGET_TRIPLET) #VCPKG HDF5 is packaged differently.
+         find_package(HDF5 CONFIG COMPONENTS C shared REQUIRED)
+-        set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
++        if (BUILD_SHARED_LIBS)
++            set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
++        else()
++            set(HDF5_C_LIBRARIES hdf5::hdf5-static)
++        endif()
+     else ()
+         find_package(HDF5 COMPONENTS C REQUIRED)
+     endif ()
diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake
index 4b6f7e6d6..0182718fd 100644
--- a/ports/ismrmrd/portfile.cmake
+++ b/ports/ismrmrd/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
     set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
 endif()
@@ -11,12 +9,13 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
-    SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892
+    REF 1066d90e5d87302ccd71ce58ee153b5c87783064 # v1.4.1
+    SHA512 a830bd3b8a9580cf182f436066213441ee04c781e6e721b82287550f2ca552d58c5390d80b4b6a6b7bd8483fa3e45bf00858268706cedb99a4390ca047eb4d6c
     HEAD_REF master
     PATCHES
         ${STATIC_PATCH}
         ${WIN32_INCLUDE_STDDEF_PATCH}
+        fix-depends-hdf5.patch
 )
 
 vcpkg_configure_cmake(
@@ -25,6 +24,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DUSE_SYSTEM_PUGIXML=ON
         -DUSE_HDF5_DATASET_SUPPORT=ON
+        -DVCPKG_TARGET_TRIPLET=ON
 )
 
 vcpkg_install_cmake()
@@ -84,7 +84,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/)
 endif()
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd)
-- 
cgit v1.2.3