early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

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 ()

51
externals/vcpkg/ports/ismrmrd/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,51 @@
if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ismrmrd/ismrmrd
REF v1.5.0
SHA512 96e24be75ecde8e56001d805ffaf4502d39c87e2c4fe01c84c90cb01d8bd49268c48440728de2ffb4c3efa75a029b3ffc0101b5841893685f82b4fafec9b1c73
HEAD_REF master
PATCHES
${WIN32_INCLUDE_STDDEF_PATCH}
fix-depends-hdf5.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUSE_SYSTEM_PUGIXML=ON
-DUSE_HDF5_DATASET_SUPPORT=ON
-DVCPKG_TARGET_TRIPLET=ON
-DBUILD_TESTS=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_UTILITIES=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ISMRMRD/)
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll")
file(COPY "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll")
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll")
file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/")
endif()
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

21
externals/vcpkg/ports/ismrmrd/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,21 @@
{
"name": "ismrmrd",
"version": "1.5.0",
"port-version": 2,
"description": "ISMRM Raw Data Format",
"homepage": "https://github.com/ismrmrd/ismrmrd",
"dependencies": [
"boost",
"fftw3",
"hdf5",
"pugixml",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@@ -0,0 +1,14 @@
diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
index 40614eb..e5e3e25 100644
--- a/include/ismrmrd/ismrmrd.h
+++ b/include/ismrmrd/ismrmrd.h
@@ -30,6 +30,9 @@ typedef unsigned __int32 uint32_t;
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
#endif
+#if _WIN32
+#include <stddef.h> /* for size_t */
+#endif
#else /* non MS C or C++ compiler */
#include <stdint.h>
#include <stddef.h> /* for size_t */