[ismrmrd] updated to version 1.4.2 (#10618)

* Updated ISMRMRD to version 1.4.2

* Updated version

* Updated to new ismrmrd micro version, which fixes build issues on windows-static
This commit is contained in:
David Christoffer Hansen 2020-04-16 22:31:59 +02:00 committed by GitHub
parent cb8cdc2721
commit 5e4995e589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 27 deletions

View File

@ -1,4 +1,5 @@
Source: ismrmrd
Version: 1.4.1
Version: 1.4.2
Description: ISMRM Raw Data Format
Build-Depends: pugixml, hdf5, boost, fftw3
Homepage: https://github.com/ismrmrd/ismrmrd

View File

@ -1,9 +0,0 @@
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>

View File

@ -2,15 +2,13 @@ if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
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 1066d90e5d87302ccd71ce58ee153b5c87783064 # v1.4.1
SHA512 a830bd3b8a9580cf182f436066213441ee04c781e6e721b82287550f2ca552d58c5390d80b4b6a6b7bd8483fa3e45bf00858268706cedb99a4390ca047eb4d6c
REF v1.4.2.1
SHA512 8d3f3efb9fc52464c626d8a4b4328f92f69ea6a709aa1b4d4312c9740a342094cadecd028ac169b6c89df92503037a3156172d7955abcd616630f0a309b9e0b5
HEAD_REF master
PATCHES
${STATIC_PATCH}
@ -25,6 +23,9 @@ vcpkg_configure_cmake(
-DUSE_SYSTEM_PUGIXML=ON
-DUSE_HDF5_DATASET_SUPPORT=ON
-DVCPKG_TARGET_TRIPLET=ON
-DBUILD_TESTS=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_UTILITIES=OFF
)
vcpkg_install_cmake()
@ -66,18 +67,6 @@ 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_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/)