-
-
Notifications
You must be signed in to change notification settings - Fork 275
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge compression changes from develop
- Loading branch information
Showing
48 changed files
with
734 additions
and
548 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # Ref: https://github.com/codespell-project/codespell#using-a-config-file | ||
| [codespell] | ||
| skip = .git,*.svg,.codespellrc,./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./config/sanitizer/sanitizers.cmake,./tools/test/h5import/testfiles/*.conf,./tools/test/h5repack/testfiles/*.dat,./test/API/driver,./configure,./bin/ltmain.sh,./bin/depcomp,./bin/config.guess,./bin/config.sub,./autom4te.cache,./m4/libtool.m4,./c++/src/*.html,./HDF5Examples/depcomp, ./release_docs/HISTORY-*.txt | ||
| skip = .git,*.svg,.codespellrc,./bin/trace,./hl/tools/h5watch/h5watch.c,./tools/test/h5jam/tellub.c,./config/sanitizer/LICENSE,./config/sanitizer/sanitizers.cmake,./tools/test/h5import/testfiles/*.conf,./tools/test/h5repack/testfiles/*.dat,./test/API/driver,./configure,./bin/ltmain.sh,./bin/depcomp,./bin/config.guess,./bin/config.sub,./autom4te.cache,./m4/libtool.m4,./c++/src/*.html,./HDF5Examples/depcomp,./release_docs/HISTORY-*.txt | ||
| check-hidden = true | ||
| # ignore-regex = | ||
| ignore-words-list = ot,isnt,inout,nd,parms,parm,ba,offsetP,ser,ois,had,fiter,fo,clude,refere,minnum,offsetp,creat,ans:,eiter,lastr,ans,isn't,ifset,sur,trun,dne,tthe,hda,filname,te,htmp,ake,gord,numer,ro,oce,msdos,TEXTIN,indx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -254,10 +254,12 @@ set (HDF5_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/test) | |
| set (HDF5_TEST_PAR_DIR ${HDF5_SOURCE_DIR}/testpar) | ||
| set (HDF5_TEST_API_SRC_DIR ${HDF5_SOURCE_DIR}/test/API) | ||
| set (HDF5_TEST_API_PAR_SRC_DIR ${HDF5_SOURCE_DIR}/testpar/API) | ||
| set (HDF5_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/c++) | ||
| set (HDF5_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/c++/src) | ||
| set (HDF5_CPP_TST_DIR ${HDF5_SOURCE_DIR}/c++/test) | ||
| set (HDF5_HL_SRC_DIR ${HDF5_SOURCE_DIR}/hl) | ||
| set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++) | ||
| set (HDF5_HL_SRC_DIR ${HDF5_SOURCE_DIR}/hl/src) | ||
| set (HDF5_HL_TST_DIR ${HDF5_SOURCE_DIR}/hl/test) | ||
| set (HDF5_HL_CPP_SRC_DIR ${HDF5_SOURCE_DIR}/hl/c++/src) | ||
| set (HDF5_HL_CPP_TST_DIR ${HDF5_SOURCE_DIR}/hl/c++/test) | ||
| set (HDF5_HL_TOOLS_DIR ${HDF5_SOURCE_DIR}/hl/tools) | ||
| set (HDF5_TOOLS_ROOT_DIR ${HDF5_SOURCE_DIR}/tools) | ||
| set (HDF5_TOOLS_SRC_DIR ${HDF5_SOURCE_DIR}/tools/src) | ||
|
|
@@ -448,7 +450,7 @@ else () | |
| endif () | ||
| set (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION_STRING}") | ||
| set (HDF5_PACKAGE_TARNAME "${HDF5_PACKAGE}${HDF_PACKAGE_EXT}") | ||
| set (HDF5_PACKAGE_URL "http://www.hdfgroup.org") | ||
| set (HDF5_PACKAGE_URL "https://www.hdfgroup.org") | ||
| set (HDF5_PACKAGE_BUGREPORT "[email protected]") | ||
|
|
||
| #----------------------------------------------------------------------------- | ||
|
|
@@ -595,8 +597,10 @@ option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" O | |
| if (HDF5_ENABLE_COVERAGE) | ||
| include (${HDF5_SOURCE_DIR}/config/sanitizer/code-coverage.cmake) | ||
| if(CODE_COVERAGE AND CODE_COVERAGE_ADDED) | ||
| message(VERBOSE "Add instrumentation to all targets") | ||
| add_code_coverage () # Adds instrumentation to all targets | ||
| else () | ||
| message(VERBOSE "Use --coverage option") | ||
| set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage") | ||
| set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0 -fprofile-arcs -ftest-coverage") | ||
| if (CMAKE_C_COMPILER_ID STREQUAL "GNU") | ||
|
|
@@ -890,10 +894,10 @@ endif () | |
| #----------------------------------------------------------------------------- | ||
| # Option to use 1.14.x API | ||
| #----------------------------------------------------------------------------- | ||
| set (H5_USE_114_API_DEFAULT 0) | ||
| if (NOT DEFAULT_API_VERSION) | ||
| set (DEFAULT_API_VERSION "v114") | ||
| endif () | ||
| set (H5_USE_114_API_DEFAULT 0) | ||
| if (DEFAULT_API_VERSION MATCHES "v114") | ||
| set (H5_USE_114_API_DEFAULT 1) | ||
| endif () | ||
|
|
@@ -906,7 +910,11 @@ include (UserMacros.cmake) | |
| #----------------------------------------------------------------------------- | ||
| # Include filter (zlib, szip, etc.) macros | ||
| #----------------------------------------------------------------------------- | ||
| include (CMakeFilters.cmake) | ||
| option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF) | ||
| option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF) | ||
| if (HDF5_ENABLE_Z_LIB_SUPPORT OR HDF5_ENABLE_SZIP_SUPPORT) | ||
| include (CMakeFilters.cmake) | ||
| endif () | ||
|
|
||
| #----------------------------------------------------------------------------- | ||
| # Include external VOL connectors | ||
|
|
@@ -1011,10 +1019,10 @@ if (HDF5_BUILD_DOC AND EXISTS "${HDF5_DOXYGEN_DIR}" AND IS_DIRECTORY "${HDF5_DOX | |
| else () | ||
| set (HDF5_DOXY_WARNINGS "NO") | ||
| endif () | ||
| message(STATUS "Doxygen version: ${DOXYGEN_VERSION}") | ||
| message(VERBOSE "Doxygen version: ${DOXYGEN_VERSION}") | ||
| add_subdirectory (doxygen) | ||
| else () | ||
| message(STATUS "Doxygen needs to be installed to generate the doxygen documentation") | ||
| message(WARNING "Doxygen needs to be installed to generate the doxygen documentation") | ||
| endif () | ||
| endif () | ||
|
|
||
|
|
@@ -1033,22 +1041,22 @@ if (EXISTS "${HDF5_SOURCE_DIR}/utils" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/utils | |
| option (HDF5_BUILD_PARALLEL_TOOLS "Build Parallel HDF5 Tools" OFF) | ||
| if (HDF5_BUILD_PARALLEL_TOOLS AND HDF5_ENABLE_PARALLEL) | ||
| set (CMAKE_PREFIX_PATH "$HDF_RESOURCES_DIR") | ||
| find_package(MFU REQUIRED) | ||
| find_package (MFU REQUIRED) | ||
| if (MFU_FOUND) | ||
| message(STATUS "LL_PATH=${LL_PATH}") | ||
| message (VERBOSE "LL_PATH=${LL_PATH}") | ||
| set (H5_HAVE_LIBMFU 1) | ||
| set (H5_HAVE_MFU_H 1) | ||
| set (CMAKE_REQUIRED_INCLUDES "${MFU_INCLUDE_DIR}") | ||
| set (MFU_LIBRARY_DEBUG "$MFU_LIBRARY") | ||
| set (MFU_LIBRARY_RELEASE "$MFU_LIBRARY") | ||
| endif () | ||
| find_package(CIRCLE REQUIRED) | ||
| find_package (CIRCLE REQUIRED) | ||
| if (CIRCLE_FOUND) | ||
| set (H5_HAVE_LIBCIRCLE 1) | ||
| set (H5_HAVE_CIRCLE_H 1) | ||
| set (CMAKE_REQUIRED_INCLUDES "${CIRCLE_INCLUDE_DIR}") | ||
| endif () | ||
| find_package(DTCMP REQUIRED) | ||
| find_package (DTCMP REQUIRED) | ||
| if (DTCMP_FOUND) | ||
| set (H5_HAVE_LIBDTCMP 1) | ||
| set (H5_HAVE_DTCMP_H 1) | ||
|
|
@@ -1071,19 +1079,16 @@ endif () | |
| #----------------------------------------------------------------------------- | ||
| # Include filter plugins | ||
| #----------------------------------------------------------------------------- | ||
| if (${H5_LIBVER_DIR} EQUAL 16 OR DEFAULT_API_VERSION MATCHES "v16") | ||
| set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE) | ||
| message (VERBOSE "Filter PLUGINs cannot be used with 1.6 API") | ||
| else () | ||
| include (CMakePlugins.cmake) | ||
| option (HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF) | ||
| if (HDF5_ENABLE_PLUGIN_SUPPORT) | ||
| if (${H5_LIBVER_DIR} EQUAL 16 OR DEFAULT_API_VERSION MATCHES "v16") | ||
| set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE) | ||
| message (VERBOSE "Filter PLUGINs cannot be used with 1.6 API") | ||
| else () | ||
| include (CMakePlugins.cmake) | ||
|
|
||
| if (HDF5_PACKAGE_EXTLIBS AND NOT HDF5_NO_PACKAGES) | ||
| if (HDF5_ENABLE_PLUGIN_SUPPORT AND PLUGIN_FOUND) | ||
| if (HDF5_PACKAGE_EXTLIBS AND NOT HDF5_NO_PACKAGES AND PLUGIN_FOUND) | ||
| PACKAGE_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) | ||
| # option (HDF5_TEST_PLUGIN "Execute plugin tests" ON) | ||
| # mark_as_advanced (HDF5_TEST_PLUGIN) | ||
|
|
||
| # TEST_PLUGIN_LIBRARY () | ||
| endif () | ||
| endif () | ||
| endif () | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| # [email protected]. | ||
| # | ||
| option (PLUGIN_USE_EXTERNAL "Use External Library Building for filter PLUGIN else search" OFF) | ||
| option (PLUGIN_USE_LOCALCONTENT "Use local file for PLUGIN FetchContent" OFF) | ||
|
|
||
| if (NOT PLUGIN_USE_LOCALCONTENT) | ||
| set (PLUGIN_URL ${PLUGIN_TGZ_ORIGPATH}/${PLUGIN_TGZ_NAME}) | ||
|
|
@@ -19,7 +20,7 @@ else () | |
| endif () | ||
| set (PLUGIN_URL ${H5PL_TGZPATH}/${PLUGIN_TGZ_NAME}) | ||
| endif () | ||
| message (STATUS "Filter PLUGIN file is ${PLUGIN_URL}") | ||
| message (VERBOSE "Filter PLUGIN file is ${PLUGIN_URL}") | ||
|
|
||
| include (ExternalProject) | ||
| #option (HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO") | ||
|
|
@@ -49,21 +50,22 @@ endif () | |
| #----------------------------------------------------------------------------- | ||
| # Option for PLUGIN support | ||
| #----------------------------------------------------------------------------- | ||
| option (HDF5_ENABLE_PLUGIN_SUPPORT "Enable PLUGIN Filters" OFF) | ||
| if (HDF5_ENABLE_PLUGIN_SUPPORT) | ||
| if (NOT PLUGIN_USE_EXTERNAL) | ||
| find_package (PLUGIN NAMES ${PLUGIN_PACKAGE_NAME}${HDF_PACKAGE_EXT}) | ||
| if (NOT PLUGIN_FOUND) | ||
| find_package (PLUGIN) # Legacy find | ||
| endif () | ||
| endif () | ||
| if (NOT PLUGIN_FOUND) | ||
| else () | ||
| if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") | ||
| EXTERNAL_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) | ||
| message (STATUS "Filter PLUGIN is built") | ||
| else () | ||
| message (FATAL_ERROR " PLUGIN is Required for PLUGIN support in HDF5") | ||
| endif () | ||
| endif () | ||
| message (STATUS "Filter PLUGIN is ON") | ||
| if (PLUGIN_FOUND) | ||
| message (STATUS "Filter PLUGIN is ON") | ||
| else () | ||
| set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE) | ||
| message (FATAL_ERROR " PLUGIN support in HDF5 was enabled but not found") | ||
| endif () | ||
| endif () | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.