diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-24 20:02:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 20:02:33 (GMT) |
commit | 108c7397372751efe5f953c854673cbcfc7356ca (patch) | |
tree | b826ec01ec8dba1e2889021675d11631d8c84b4d /config/cmake/scripts | |
parent | 9e93204a23346a5b7cf5b8673cf50e6ac2497021 (diff) | |
download | hdf5-108c7397372751efe5f953c854673cbcfc7356ca.zip hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.gz hdf5-108c7397372751efe5f953c854673cbcfc7356ca.tar.bz2 |
1.8 Merge config changes from dev (#1032)
* Merge config changes from dev
* Revert added git file changes
* Merge MS clang needs EHsc flag #1035
Diffstat (limited to 'config/cmake/scripts')
-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 b89b915..5a44cde 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -11,7 +11,7 @@ # ############################################################################################# ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE ### -### BUILD_GENERATOR required [Unix, VS2017, VS201764, VS2015, VS201564, VS2013, VS201364] ### +### BUILD_GENERATOR required [Unix, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564] ### ### ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf518.log ### ############################################################################################# @@ -68,7 +68,7 @@ endif () # build generator must be defined if (NOT DEFINED BUILD_GENERATOR) - message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364") + message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, or VS201764, VS2015, VS201564") endif () ################################################################### @@ -105,7 +105,7 @@ endif () ######### Following describes compiler ############ if (NOT DEFINED HPC) if (NOT DEFINED BUILD_GENERATOR) - message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2017, or VS201764, VS2015, VS201564, VS2013, VS201364") + message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2019, VS201964, VS2017, or VS201764, VS2015, VS201564") endif () if (WIN32 AND NOT MINGW) set (SITE_OS_NAME "Windows") |