summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-08-25 20:46:52 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-08-25 20:46:52 (GMT)
commit3b3228a3985a55d2cbed389c7dd1e456c811c262 (patch)
tree0dfc411062518c2e088790b27ac59a6aaaf499b5 /config/cmake
parentc6916356c25214ebebe2c8f88a1df659bd4ac075 (diff)
downloadhdf5-3b3228a3985a55d2cbed389c7dd1e456c811c262.zip
hdf5-3b3228a3985a55d2cbed389c7dd1e456c811c262.tar.gz
hdf5-3b3228a3985a55d2cbed389c7dd1e456c811c262.tar.bz2
Revert "Merge pull request #2840 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7"
This reverts commit c6916356c25214ebebe2c8f88a1df659bd4ac075, reversing changes made to 6abf2770b39878acde57e74fb7d87f07be7390dc.
Diffstat (limited to 'config/cmake')
-rwxr-xr-xconfig/cmake/scripts/HDF5config.cmake2
-rwxr-xr-xconfig/cmake/scripts/HDF5options.cmake1
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