Skip to content

[ismrmrd] Update to 1.4.1 #8880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 1 commit into from
Jan 10, 2020
Merged

[ismrmrd] Update to 1.4.1 #8880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/ismrmrd/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions ports/ismrmrd/fix-depends-hdf5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ()
11 changes: 5 additions & 6 deletions ports/ismrmrd/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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(
Expand All @@ -25,6 +24,7 @@ vcpkg_configure_cmake(
OPTIONS
-DUSE_SYSTEM_PUGIXML=ON
-DUSE_HDF5_DATASET_SUPPORT=ON
-DVCPKG_TARGET_TRIPLET=ON
)

vcpkg_install_cmake()
Expand Down Expand Up @@ -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)