3 files changed, 43 insertions, 22 deletions
diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL
index 7f7c26ef7..f876416d4 100644
--- a/ports/ismrmrd/CONTROL
+++ b/ports/ismrmrd/CONTROL
@@ -1,4 +1,4 @@
 Source: ismrmrd
-Version: 1.4.0
+Version: 1.4.0-1
 Description: ISMRM Raw Data Format
-Build-Depends: pugixml, hdf5
+Build-Depends: pugixml, hdf5, boost, fftw3
diff --git a/ports/ismrmrd/fix_static.patch b/ports/ismrmrd/fix_static.patch
new file mode 100644
index 000000000..e9bd5f360
--- /dev/null
+++ b/ports/ismrmrd/fix_static.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/test_main.cpp b/tests/test_main.cpp
+index 4b1809d..7ec1414 100644
+--- a/tests/test_main.cpp
++++ b/tests/test_main.cpp
+@@ -1,4 +1,3 @@
+-#define BOOST_TEST_DYN_LINK
+ #define BOOST_TEST_MODULE "ISMRMRD Unit Tests"
+ #include <boost/test/unit_test.hpp>
+ 
diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake
index 7427cb1b2..4b6f7e6d6 100644
--- a/ports/ismrmrd/portfile.cmake
+++ b/ports/ismrmrd/portfile.cmake
@@ -1,34 +1,34 @@
 include(vcpkg_common_functions)
 
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
-    set(WIN32_INCLUDE_STDDEF "x86-windows-include-stddef.patch")
+    set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(STATIC_PATCH "fix_static.patch")
 endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
-    SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892 
+    REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
+    SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892
     HEAD_REF master
     PATCHES
-        ${WIN32_INCLUDE_STDDEF}
+        ${STATIC_PATCH}
+        ${WIN32_INCLUDE_STDDEF_PATCH}
 )
 
-
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS 
-		-DUSE_SYSTEM_PUGIXML=ON
-		-DUSE_HDF5_DATASET_SUPPORT=ON
+    OPTIONS
+        -DUSE_SYSTEM_PUGIXML=ON
+        -DUSE_HDF5_DATASET_SUPPORT=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/ismrmrd/cmake)
 
 if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll)
@@ -62,15 +62,27 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${ISMRMRD_CMAKE_DIRS})
 
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+    set(EXECUTABLE_SUFFIX ".exe")
+endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info.exe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_info.exe)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_c_example.exe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_c_example.exe)
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_read_timing_test.exe)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_read_timing_test.exe)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_c_example${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_c_example${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_generate_cartesian_shepp_logan${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_generate_cartesian_shepp_logan${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_info${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_read_timing_test${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_read_timing_test${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_recon_cartesian_2d${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_recon_cartesian_2d${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_test_xml${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_test_xml${EXECUTABLE_SUFFIX})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
+    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)