diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-23 13:26:38 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-23 13:26:38 (GMT) |
| commit | 4279227e60e48b97cb59d30986dd4f6715a77931 (patch) | |
| tree | 7b655ce71ce9607562099618a2a4d49935de3c15 | |
| parent | 9186d2966083aca8cf2852b75777cc1186f63912 (diff) | |
| download | hdf5-4279227e60e48b97cb59d30986dd4f6715a77931.zip hdf5-4279227e60e48b97cb59d30986dd4f6715a77931.tar.gz hdf5-4279227e60e48b97cb59d30986dd4f6715a77931.tar.bz2 | |
OESS-98 - add option to build plugin library with hdf5
| -rw-r--r--[-rwxr-xr-x] | config/cmake/CTestScript.cmake | 0 | ||||
| -rw-r--r-- | config/cmake/HDF5PluginMacros.cmake | 8 | ||||
| -rw-r--r-- | config/cmake/cacheinit.cmake | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | config/cmake/libh5cc.in | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | config/cmake/libhdf5.pc.in | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | config/cmake/scripts/CTestScript.cmake | 0 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 10 |
7 files changed, 14 insertions, 14 deletions
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake index 5478862..5478862 100755..100644 --- a/config/cmake/CTestScript.cmake +++ b/config/cmake/CTestScript.cmake diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake index 3cded02..2c9e5e6 100644 --- a/config/cmake/HDF5PluginMacros.cmake +++ b/config/cmake/HDF5PluginMacros.cmake @@ -49,8 +49,8 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type) -DLZ4_PACKAGE_NAME:STRING=${LZ4_PACKAGE_NAME} -DLZF_TGZ_NAME:STRING=${LZF_TGZ_NAME} -DLZF_PACKAGE_NAME:STRING=${LZF_PACKAGE_NAME} - #-DSZ_TGZ_NAME:STRING=${SZ_TGZ_NAME} - #-DSZ_PACKAGE_NAME:STRING=${SZ_PACKAGE_NAME} + -DSZF_TGZ_NAME:STRING=${SZF_TGZ_NAME} + -DSZF_PACKAGE_NAME:STRING=${SZF_PACKAGE_NAME} -DZFP_TGZ_NAME:STRING=${ZFP_TGZ_NAME} -DZFP_PACKAGE_NAME:STRING=${ZFP_PACKAGE_NAME} ) @@ -101,8 +101,8 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type) -DLZ4_PACKAGE_NAME:STRING=${LZ4_PACKAGE_NAME} -DLZF_TGZ_NAME:STRING=${LZF_TGZ_NAME} -DLZF_PACKAGE_NAME:STRING=${LZF_PACKAGE_NAME} - #-DSZ_TGZ_NAME:STRING=${SZ_TGZ_NAME} - #-DSZ_PACKAGE_NAME:STRING=${SZ_PACKAGE_NAME} + -DSZF_TGZ_NAME:STRING=${SZF_TGZ_NAME} + -DSZF_PACKAGE_NAME:STRING=${SZF_PACKAGE_NAME} -DZFP_TGZ_NAME:STRING=${ZFP_TGZ_NAME} -DZFP_PACKAGE_NAME:STRING=${ZFP_PACKAGE_NAME} ) diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 926e230..f8ab3a2 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -155,15 +155,15 @@ set (LZF_PACKAGE_NAME "lzf" CACHE STRING "Name of LZF package" FORCE) #set (MAFISC_PACKAGE_NAME "mafisc" CACHE STRING "Name of MAFISC package" FORCE) ###### -# sz +# szf ###### -set (SZ_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE) -set (SZ_GIT_BRANCH "master" CACHE STRING "" FORCE) +set (SZF_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE) +set (SZF_GIT_BRANCH "master" CACHE STRING "" FORCE) -set (SZ_TGZ_NAME "sz.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE) +set (SZF_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE) -set (SZ_PACKAGE_NAME "sz" CACHE STRING "Name of SZ package" FORCE) +set (SZF_PACKAGE_NAME "szf" CACHE STRING "Name of SZ package" FORCE) ###### # zfp diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in index f462d56..f462d56 100755..100644 --- a/config/cmake/libh5cc.in +++ b/config/cmake/libh5cc.in diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in index 4a2ebaa..4a2ebaa 100755..100644 --- a/config/cmake/libhdf5.pc.in +++ b/config/cmake/libhdf5.pc.in diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index e3659f6..e3659f6 100755..100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index ded4086..aed2d18 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -570,12 +570,12 @@ These five steps are described in detail below. #set (BUILD_MAFISC_LIBRARY_SOURCE OFF CACHE BOOL "build the mafisc library within the plugin" FORCE) #set (MAFISC_PACKAGE_NAME "mafisc" CACHE STRING "Name of MAFISC package" FORCE) ###### - # sz + # szf ###### - set (SZ_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE) - set (SZ_GIT_BRANCH "master" CACHE STRING "" FORCE) - set (SZ_TGZ_NAME "sz.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE) - set (SZ_PACKAGE_NAME "sz" CACHE STRING "Name of SZ package" FORCE) + set (SZF_GIT_URL "https://github.com/disheng222/SZ" CACHE STRING "Use SZ from github repository" FORCE) + set (SZF_GIT_BRANCH "master" CACHE STRING "" FORCE) + set (SZF_TGZ_NAME "szf.tar.gz" CACHE STRING "Use SZ from compressed file" FORCE) + set (SZF_PACKAGE_NAME "szf" CACHE STRING "Name of SZ package" FORCE) ###### # zfp ###### |