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,19 @@
diff --git a/CMake/HighFiveTargetDeps.cmake b/CMake/HighFiveTargetDeps.cmake
index 51bc7b2..f04bf4c 100644
--- a/CMake/HighFiveTargetDeps.cmake
+++ b/CMake/HighFiveTargetDeps.cmake
@@ -10,7 +10,13 @@ if(NOT TARGET libdeps)
if(NOT DEFINED HDF5_C_LIBRARIES)
set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE TRUE) # Consistency
set(HDF5_PREFER_PARALLEL ${HIGHFIVE_PARALLEL_HDF5})
- find_package(HDF5 REQUIRED)
+ find_package(hdf5 CONFIG REQUIRED)
+ set(HIGHFIVE_PARALLEL_HDF5 ${HDF5_ENABLE_PARALLEL})
+ if(TARGET hdf5::hdf5-shared)
+ set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
+ elseif(TARGET hdf5::hdf5-static)
+ set(HDF5_C_LIBRARIES hdf5::hdf5-static)
+ endif()
endif()
if(HIGHFIVE_PARALLEL_HDF5 AND NOT HDF5_IS_PARALLEL)

View File

@@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d42b6e..e6d9f18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,10 @@ option(HIGHFIVE_BUILD_DOCS "Enable documentation building" ON)
option(HIGHFIVE_USE_INSTALL_DEPS "End applications by default use detected dependencies here" OFF)
mark_as_advanced(HIGHFIVE_USE_INSTALL_DEPS)
+# Allow big object
+if(MSVC)
+ add_compile_options(/bigobj)
+endif()
# Check compiler cxx_std requirements
# -----------------------------------

47
externals/vcpkg/ports/highfive/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,47 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO BlueBrain/HighFive
REF v2.3
SHA512 5bf8bc6d3a57be39a4fd15f28f8c839706e2c8d6e2270f45ea39c28a2ac1e3c7f31ed2f48390a45a868c714c85f03f960a0bc8fad945c80b41f495e6f4aca36a
HEAD_REF master
PATCHES
fix-dependency-hdf5.patch
fix-error-C1128.patch
)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
boost HIGHFIVE_USE_BOOST
tests HIGHFIVE_UNIT_TESTS
xtensor HIGHFIVE_USE_XTENSOR
eigen3 HIGHFIVE_USE_EIGEN
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DHIGHFIVE_EXAMPLES=OFF
-DHIGHFIVE_BUILD_DOCS=OFF
)
vcpkg_cmake_install()
if("tests" IN_LIST FEATURES)
vcpkg_copy_tools(
TOOL_NAMES
tests_high_five_base
tests_high_five_easy
tests_high_five_multi_dims
SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/tests/unit" # Tools are not installed so release version tools are manually copied
)
endif()
# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time
vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

54
externals/vcpkg/ports/highfive/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,54 @@
{
"name": "highfive",
"version": "2.3",
"port-version": 2,
"description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5",
"homepage": "https://github.com/BlueBrain/HighFive",
"license": "BSL-1.0",
"dependencies": [
"hdf5",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"boost": {
"description": "Enables Boost support",
"dependencies": [
"boost-multi-array",
"boost-serialization",
"boost-system",
"boost-ublas"
]
},
"eigen3": {
"description": "Enable Eigen testing",
"dependencies": [
"eigen3"
]
},
"tests": {
"description": "Build unit tests",
"dependencies": [
"boost-test",
{
"name": "highfive",
"features": [
"boost"
]
}
]
},
"xtensor": {
"description": "Enable xtensor testing",
"dependencies": [
"xtensor"
]
}
}
}