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,28 @@
diff --git a/cmake/thirdParties.cmake b/cmake/thirdParties.cmake
index 41d8529..392d455 100644
--- a/cmake/thirdParties.cmake
+++ b/cmake/thirdParties.cmake
@@ -19,7 +19,7 @@ if(MATIO_WITH_HDF5)
endif()
set(HDF5_FOUND TRUE)
else()
- find_package(HDF5)
+ find_package(HDF5 CONFIG REQUIRED)
if(HDF5_FOUND)
set(HDF_MIN_VER 1.8)
if(HDF5_VERSION VERSION_LESS ${HDF_MIN_VER})
@@ -44,9 +44,12 @@ if(HDF5_FOUND)
elseif(TARGET hdf5)
# target from hdf5 1.8 config
target_link_libraries(MATIO::HDF5 INTERFACE hdf5)
- elseif(TARGET HDF5::HDF5)
+ elseif(TARGET hdf5::hdf5-shared)
# target defined in CMake FindHDF5 (since 3.19)
- target_link_libraries(MATIO::HDF5 INTERFACE HDF5::HDF5)
+ target_link_libraries(MATIO::HDF5 INTERFACE hdf5::hdf5-shared)
+ elseif(TARGET hdf5::hdf5-static)
+ # target defined in CMake FindHDF5 (since 3.19)
+ target_link_libraries(MATIO::HDF5 INTERFACE hdf5-static)
else()
# results from CMake FindHDF5
set_target_properties(MATIO::HDF5 PROPERTIES

36
externals/vcpkg/ports/matio/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,36 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tbeu/matio
REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23
SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c
HEAD_REF master
PATCHES fix-dependencies.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
hdf5 MATIO_WITH_HDF5
zlib MATIO_WITH_ZLIB
extended-sparse MATIO_EXTENDED_SPARSE
mat73 MATIO_MAT73
pic MATIO_PIC
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS ${FEATURE_OPTIONS}
-DMATIO_SHARED=${BUILD_SHARED}
-DMATIO_USE_CONAN=OFF
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_copy_tools(TOOL_NAMES matdump AUTO_CLEAN)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

40
externals/vcpkg/ports/matio/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,40 @@
{
"name": "matio",
"version-semver": "1.5.23",
"description": "MATLAB MAT File I/O Library",
"homepage": "https://github.com/tbeu/matio",
"license": "BSD-2-Clause",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
],
"default-features": [
"hdf5",
"zlib"
],
"features": {
"extended-sparse": {
"description": "Enable extended sparse matrix data types not supported in MATLAB"
},
"hdf5": {
"description": "Check for HDF5 library",
"dependencies": [
"hdf5"
]
},
"mat73": {
"description": "Enable support for version 7.3 MAT files"
},
"pic": {
"description": "Enable position-independent code (PIC), i.e., compilation with the -fPIC flag"
},
"zlib": {
"description": "Check for zlib library",
"dependencies": [
"zlib"
]
}
}
}