philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1 10 merges from develop (#298)

Browse Source 
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms
This commit is contained in:
Allen Byrne
2021-02-04 08:20:25 -06:00
committed by GitHub
parent 674e1f02a3
commit 8cfcf0e394
39 changed files with 466 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/cmake/HDF5PluginMacros.cmake
View File

@@ -14,7 +14,9 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
)
endif ()
FetchContent_GetProperties(PLUGIN)
message (STATUS "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
endif ()
if(NOT PLUGIN_POPULATED)
FetchContent_Populate(PLUGIN)
include (${HDF_RESOURCES_DIR}/HDF5PluginCache.cmake)
@@ -65,8 +67,10 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
add_dependencies (h5ex_d_zfp ${HDF5_LIBSH_TARGET})
target_include_directories (h5ex_d_zfp PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR}")
endif ()
endif()
message (STATUS "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
endif ()
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
endif ()
set (PLUGIN_BINARY_DIR "${plugin_BINARY_DIR}")
set (PLUGIN_SOURCE_DIR "${plugin_SOURCE_DIR}")
set (PLUGIN_LIBRARY "PLUGIN")