diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-08-25 21:48:31 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-08-25 21:48:31 (GMT) |
commit | 58d4e30e6cebac781ea1c8f1de7574fc16ba0b8a (patch) | |
tree | e88eb17b57c25c2551f1d62e1caec1e11a717629 /config/cmake | |
parent | c6916356c25214ebebe2c8f88a1df659bd4ac075 (diff) | |
parent | 7a3f80a31e702c029ce7668bb985f37f485fdfc6 (diff) | |
download | hdf5-58d4e30e6cebac781ea1c8f1de7574fc16ba0b8a.zip hdf5-58d4e30e6cebac781ea1c8f1de7574fc16ba0b8a.tar.gz hdf5-58d4e30e6cebac781ea1c8f1de7574fc16ba0b8a.tar.bz2 |
Merge pull request #2842 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7
* commit '7a3f80a31e702c029ce7668bb985f37f485fdfc6':
Merge pull request #2841 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
Revert "Merge pull request #2840 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7"
Diffstat (limited to 'config/cmake')
-rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 | ||||
-rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 41e56ca..daa43fb 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 3.12) ############################################################################## set (CTEST_SOURCE_VERSION "1.10.7") -set (CTEST_SOURCE_VERSEXT ".1") +set (CTEST_SOURCE_VERSEXT "-1") ############################################################################## # handle input parameters to script. diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake index 3bc7ef6..28a78d3 100755 --- a/config/cmake/scripts/HDF5options.cmake +++ b/config/cmake/scripts/HDF5options.cmake @@ -97,7 +97,6 @@ endif() #set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON") ### Create install package with external libraries (szip, zlib) set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") -set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ROS3_VFD:BOOL=TRUE") ############################################################################################# ### use a toolchain file |