The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ismrmrd]Upgrade to 1.4.1 (#8880)

Browse Source
This commit is contained in:
Jack·Boos·Yu 2020-01-11 07:44:54 +08:00 committed by dan-shaw
parent 3200392582
commit 7844dedfcb
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ismrmrd/CONTROL
View File

@ -1,4 +1,4 @@
Source: ismrmrd Source: ismrmrd
Version: 1.4.0-1 Version: 1.4.1
Description: ISMRM Raw Data Format Description: ISMRM Raw Data Format
Build-Depends: pugixml, hdf5, boost, fftw3 Build-Depends: pugixml, hdf5, boost, fftw3

17
ports/ismrmrd/fix-depends-hdf5.patch Normal file
View File

@ -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
ports/ismrmrd/portfile.cmake
View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch") set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
endif() endif()
@ -11,12 +9,13 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ismrmrd/ismrmrd REPO ismrmrd/ismrmrd
REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc REF 1066d90e5d87302ccd71ce58ee153b5c87783064 # v1.4.1
SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892 SHA512 a830bd3b8a9580cf182f436066213441ee04c781e6e721b82287550f2ca552d58c5390d80b4b6a6b7bd8483fa3e45bf00858268706cedb99a4390ca047eb4d6c
HEAD_REF master HEAD_REF master
PATCHES PATCHES
${STATIC_PATCH} ${STATIC_PATCH}
${WIN32_INCLUDE_STDDEF_PATCH} ${WIN32_INCLUDE_STDDEF_PATCH}
fix-depends-hdf5.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(
@ -25,6 +24,7 @@ vcpkg_configure_cmake(
OPTIONS OPTIONS
-DUSE_SYSTEM_PUGIXML=ON -DUSE_SYSTEM_PUGIXML=ON
-DUSE_HDF5_DATASET_SUPPORT=ON -DUSE_HDF5_DATASET_SUPPORT=ON
-DVCPKG_TARGET_TRIPLET=ON
) )
vcpkg_install_cmake() vcpkg_install_cmake()
@ -84,7 +84,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/)
endif() endif()
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd)