diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:04:23 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-06-24 23:04:23 (GMT) |
| commit | b193bc11c966d79b76ebc3bbe76728f0693693ef (patch) | |
| tree | 83b9e6782bc080051d3056f5610952a4bef08ca9 /config | |
| parent | e9f476dad47ce593f13dacb77b1cc664d1f24e7b (diff) | |
| download | hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.zip hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.tar.gz hdf5-b193bc11c966d79b76ebc3bbe76728f0693693ef.tar.bz2 | |
Revert "Merge pull request #1116 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_10 to develop"
This reverts commit e9f476dad47ce593f13dacb77b1cc664d1f24e7b, reversing
changes made to 2ff00b1b937ebe36ac6ddf590c16a4c27fc0b053.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 6 | ||||
| -rw-r--r-- | config/lt_vers.am | 42 |
2 files changed, 24 insertions, 24 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 0123bce..7eaf80a 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -34,8 +34,8 @@ cmake_minimum_required (VERSION 3.10) # CTEST_SOURCE_NAME - source folder
##############################################################################
-set (CTEST_SOURCE_VERSION "1.10.3")
-set (CTEST_SOURCE_VERSEXT "-snap4")
+set (CTEST_SOURCE_VERSION "1.11.2")
+set (CTEST_SOURCE_VERSEXT "")
##############################################################################
# handle input parameters to script.
@@ -184,7 +184,7 @@ set (MODEL "Experimental") ##### Following controls source update #####
#set (LOCAL_UPDATE "TRUE")
set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")
-set (REPOSITORY_BRANCH "hdf5_1_10_2")
+set (REPOSITORY_BRANCH "develop")
#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
diff --git a/config/lt_vers.am b/config/lt_vers.am index 82cf35e..fcc2a40 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -12,13 +12,13 @@ ## If you do not have access to either file, you may request a copy from ## help@hdfgroup.org. ## -## Add libtool shared library version numbers to the HDF5 library -## See libtool versioning documentation online. -## After making changes, run bin/reconfigure to update other configure related -## files like Makefile.in. -LT_VERS_INTERFACE = 102 +# Add libtool shared library version numbers to the HDF5 library +# See libtool versioning documentation online. +# After making changes, run bin/reconfigure to update other configure related +# files like Makefile.in. +LT_VERS_INTERFACE = 1000 +LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_VERS_AGE = 1 ## If the API changes *at all*, increment LT_VERS_INTERFACE and ## reset LT_VERS_REVISION to 0. @@ -39,31 +39,31 @@ LT_VERS_AGE = 1 ## the effects of the H5_V1_x_COMPAT flag. ## ## Version numbers for wrapper shared library files. -LT_CXX_VERS_INTERFACE = 102 +LT_CXX_VERS_INTERFACE = 1000 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 101 -LT_F_VERS_REVISION = 1 -LT_F_VERS_AGE = 1 +LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_REVISION = 0 +LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 101 +LT_HL_VERS_INTERFACE = 1000 LT_HL_VERS_REVISION = 0 -LT_HL_VERS_AGE = 1 +LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 101 -LT_HL_CXX_VERS_REVISION = 1 -LT_HL_CXX_VERS_AGE = 1 +LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_REVISION = 0 +LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 100 -LT_HL_F_VERS_REVISION = 2 +LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 102 +LT_JAVA_VERS_INTERFACE = 1000 LT_JAVA_VERS_REVISION = 0 -LT_JAVA_VERS_AGE = 2 +LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 101 +LT_TOOLS_VERS_INTERFACE = 1000 LT_TOOLS_VERS_REVISION = 0 -LT_TOOLS_VERS_AGE = 1 +LT_TOOLS_VERS_AGE = 0 |