diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-16 17:53:38 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-16 17:53:38 (GMT) |
| commit | fe3852a3211050e758277a772f3d58e84a4244d5 (patch) | |
| tree | 499db7b353c1d163b98f8041972112559a272979 /config/cmake/scripts/HDF5config.cmake | |
| parent | 2f696170c28e3f241e3ae57882d12343c42b01bb (diff) | |
| parent | b0e84840e1e5bb286bc507d06d550711df498f02 (diff) | |
| download | hdf5-fe3852a3211050e758277a772f3d58e84a4244d5.zip hdf5-fe3852a3211050e758277a772f3d58e84a4244d5.tar.gz hdf5-fe3852a3211050e758277a772f3d58e84a4244d5.tar.bz2 | |
Merge pull request #1065 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8_21 to hdf5_1_8_21
* commit 'b0e84840e1e5bb286bc507d06d550711df498f02':
Fix soversion naming and update cmake scripts
Diffstat (limited to 'config/cmake/scripts/HDF5config.cmake')
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 9d427ec..36c4888 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -12,7 +12,7 @@ #############################################################################################
### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE ###
### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ### -### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf518.log ###
+### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf518.log ###
#############################################################################################
cmake_minimum_required (VERSION 3.10)
@@ -42,7 +42,7 @@ set (CTEST_SOURCE_VERSEXT "-pre1") #BUILD_GENERATOR - which CMake generator to use, required
#INSTALLDIR - HDF5-1.8 root folder
#CTEST_CONFIGURATION_TYPE - Release, Debug, RelWithDebInfo
-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.20
+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.8.x
if (DEFINED CTEST_SCRIPT_ARG)
# transform ctest script arguments of the form
# script.ctest,var1=value1,var2=value2
@@ -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_8_20")
+set (REPOSITORY_BRANCH "hdf5_1_8_21")
#uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
|