mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-06 17:20:42 +08:00
Some corrections and fix for plugins (#3712)
This commit is contained in:
Allen Byrne
GitHub
parent
ebd3744407
commit
29c1c02300
@ -412,6 +412,13 @@ set (HDF5_PACKAGE_TARNAME "${HDF5_PACKAGE}${HDF_PACKAGE_EXT}")
|
||||
set (HDF5_PACKAGE_URL "http://www.hdfgroup.org")
|
||||
set (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org")
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Set variables needed for installation
|
||||
#-----------------------------------------------------------------------------
|
||||
set (HDF5_VERSION_STRING ${HDF5_PACKAGE_VERSION})
|
||||
set (HDF5_VERSION_MAJOR ${HDF5_PACKAGE_VERSION_MAJOR})
|
||||
set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR})
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Include some macros for reusable code
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
# examples are the tests for plugins
|
||||
set (H5PL_BUILD_TESTING ON CACHE BOOL "Enable H5PL testing" FORCE)
|
||||
set (BUILD_EXAMPLES ON CACHE BOOL "Build H5PL Examples" FORCE)
|
||||
set (BUILD_EXAMPLES ${HDF5_BUILD_EXAMPLES} CACHE BOOL "Build H5PL Examples" FORCE)
|
||||
|
||||
#preset HDF5 cache vars to this projects libraries instead of searching
|
||||
set (H5PL_HDF5_HEADER "H5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE)
|
||||
|
||||
@ -31,56 +31,6 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
|
||||
include (${HDF_RESOURCES_DIR}/HDF5PluginCache.cmake)
|
||||
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
|
||||
add_subdirectory(${plugin_SOURCE_DIR} ${plugin_BINARY_DIR})
|
||||
if (ENABLE_BLOSC)
|
||||
add_dependencies (h5blosc ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_blosc ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_blosc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_BSHUF)
|
||||
add_dependencies (h5bshuf ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_bshuf ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_bshuf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_BZIP2)
|
||||
add_dependencies (h5bz2 ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_bzip2 ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_bzip2 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_JPEG)
|
||||
add_dependencies (h5jpeg ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_jpeg ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_jpeg PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_LZ4)
|
||||
add_dependencies (h5lz4 ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_lz4 ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_lz4 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_LZF)
|
||||
add_dependencies (h5lzf ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_lzf ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_lzf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_MAFISC)
|
||||
add_dependencies (h5mafisc ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_mafisc ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_mafisc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_SZ)
|
||||
add_dependencies (h5sz ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_sz ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_sz PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_ZFP)
|
||||
add_dependencies (h5zfp ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_zfp ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_zfp PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
if (ENABLE_ZSTD)
|
||||
add_dependencies (h5zstd ${HDF5_LIBSH_TARGET})
|
||||
add_dependencies (h5ex_d_zstd ${HDF5_LIBSH_TARGET})
|
||||
target_include_directories (h5ex_d_zstd PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
|
||||
endif ()
|
||||
endif ()
|
||||
message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
|
||||
set (PLUGIN_BINARY_DIR "${plugin_BINARY_DIR}")
|
||||
|
||||
@ -202,14 +202,14 @@ endforeach ()
|
||||
# Initialize the CTEST commands
|
||||
#------------------------------
|
||||
if (CMAKE_GENERATOR_TOOLSET)
|
||||
set (CTEST_CONFIGURE_TOOLSET "-T${CMAKE_GENERATOR_TOOLSET}")
|
||||
set (CTEST_CONFIGURE_TOOLSET "\"-T${CMAKE_GENERATOR_TOOLSET}\"")
|
||||
else ()
|
||||
set (CTEST_CONFIGURE_TOOLSET "")
|
||||
set (CTEST_CONFIGURE_TOOLSET)
|
||||
endif()
|
||||
if (CMAKE_GENERATOR_ARCHITECTURE)
|
||||
set (CTEST_CONFIGURE_ARCHITECTURE "-A${CMAKE_GENERATOR_ARCHITECTURE}")
|
||||
set (CTEST_CONFIGURE_ARCHITECTURE "\"-A${CMAKE_GENERATOR_ARCHITECTURE}\"")
|
||||
else ()
|
||||
set (CTEST_CONFIGURE_ARCHITECTURE "")
|
||||
set (CTEST_CONFIGURE_ARCHITECTURE)
|
||||
endif()
|
||||
if (LOCAL_MEMCHECK_TEST)
|
||||
if(LOCAL_USE_VALGRIND)
|
||||
@ -217,7 +217,7 @@ if (LOCAL_MEMCHECK_TEST)
|
||||
find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
|
||||
endif()
|
||||
set (CTEST_CONFIGURE_COMMAND
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" ${CTEST_CONFIGURE_ARCHITECTURE} ${CTEST_CONFIGURE_TOOLSET} \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
)
|
||||
else ()
|
||||
if (LOCAL_COVERAGE_TEST)
|
||||
@ -226,7 +226,7 @@ else ()
|
||||
endif ()
|
||||
endif ()
|
||||
set (CTEST_CONFIGURE_COMMAND
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
"${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" ${CTEST_CONFIGURE_ARCHITECTURE} ${CTEST_CONFIGURE_TOOLSET} \"${CTEST_SOURCE_DIRECTORY}\""
|
||||
)
|
||||
endif ()
|
||||
|
||||
|
||||
@ -73,6 +73,7 @@ New Features
|
||||
Removed HDF options for using FETCH_CONTENT explicitly:
|
||||
BUILD_SZIP_WITH_FETCHCONTENT:BOOL
|
||||
BUILD_ZLIB_WITH_FETCHCONTENT:BOOL
|
||||
|
||||
- Thread-safety + static library disabled on Windows w/ CMake
|
||||
|
||||
The thread-safety feature requires hooks in DllMain(), which is only
|
||||
@ -286,7 +287,6 @@ New Features
|
||||
|
||||
Fortran Library:
|
||||
----------------
|
||||
|
||||
- Fixed an uninitialized error return value for hdferr
|
||||
to return the error state of the h5aopen_by_idx_f API.
|
||||
|
||||
@ -831,6 +831,7 @@ Bug Fixes since HDF5-1.14.0 release
|
||||
-----------
|
||||
-
|
||||
|
||||
|
||||
High-Level Library
|
||||
------------------
|
||||
-
|
||||
@ -1007,14 +1008,12 @@ Platforms Tested
|
||||
x86_64;
|
||||
Version 19.10-0
|
||||
|
||||
Windows 10 x64 Visual Studio 2015 w/ Intel C/C++/Fortran 18 (cmake)
|
||||
Visual Studio 2017 w/ Intel C/C++/Fortran 19 (cmake)
|
||||
Visual Studio 2019 w/ clang 12.0.0
|
||||
Windows 10 x64 Visual Studio 2019 w/ clang 12.0.0
|
||||
with MSVC-like command-line (C/C++ only - cmake)
|
||||
Visual Studio 2019 w/ Intel C/C++/Fortran oneAPI 2022 (cmake)
|
||||
Visual Studio 2019 w/ Intel C/C++ only cmake)
|
||||
Visual Studio 2022 w/ clang 15.0.1
|
||||
with MSVC-like command-line (C/C++ only - cmake)
|
||||
Visual Studio 2022 w/ Intel C/C++/Fortran oneAPI 2022 (cmake)
|
||||
Visual Studio 2022 w/ Intel C/C++/Fortran oneAPI 2023 (cmake)
|
||||
Visual Studio 2019 w/ MSMPI 10.1 (C only - cmake)
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user