diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-06-30 20:59:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-30 20:59:46 (GMT) |
| commit | 779db127fc2f71bfacb5d6011921c83759605826 (patch) | |
| tree | 60b6bf998209f852a35a265fa8c8da1679025d9d | |
| parent | adfd0c0f6eb65c8a411ad5bf79bc1ed83a8f78c4 (diff) | |
| download | hdf5-779db127fc2f71bfacb5d6011921c83759605826.zip hdf5-779db127fc2f71bfacb5d6011921c83759605826.tar.gz hdf5-779db127fc2f71bfacb5d6011921c83759605826.tar.bz2 | |
Adjust presets timeout and fix build script VS versions (#3218)
| -rw-r--r-- | config/cmake-presets/hidden-presets.json | 2 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config/cmake-presets/hidden-presets.json b/config/cmake-presets/hidden-presets.json index c616e7d..18ffdd1 100644 --- a/config/cmake-presets/hidden-presets.json +++ b/config/cmake-presets/hidden-presets.json @@ -360,7 +360,7 @@ "hidden": true, "execution": { "noTestsAction": "error", - "timeout": 180, + "timeout": 600, "jobs": 8 } }, diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index e3f66e0..80d2086 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -11,8 +11,8 @@ # ############################################################################################# ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE ### -### BUILD_GENERATOR required [Unix, VS2022, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564] ### -### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -VV -O hdf5.log ### +### BUILD_GENERATOR required [Unix, VS2022, VS202264, VS2019, VS201964] ### +### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -VV -O hdf5.log ### ############################################################################################# cmake_minimum_required (VERSION 3.12) @@ -68,7 +68,7 @@ endif () # build generator must be defined if (NOT DEFINED BUILD_GENERATOR) - message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2022, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564") + message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2022, VS202264, VS2019, VS201964") 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, VS2022, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564") + message (FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2022, VS202264, VS2019, VS201964") endif () if (WIN32 AND NOT MINGW) set (SITE_OS_NAME "Windows") @@ -175,10 +175,10 @@ if (NOT DEFINED HPC) set (SITE_COMPILER_NAME "vs2012") set (SITE_COMPILER_VERSION "11") else () - message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS2019, VS201964, VS2017, VS201764, VS2015, VS201564") + message (FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2022, VS202264, VS2019, VS201964") endif () ## Set the following to unique id your computer ## - set (CTEST_SITE "WIN7${BUILD_GENERATOR}.XXXX") + set (CTEST_SITE "WIN10${BUILD_GENERATOR}.XXXX") else () if (MINGW) set (CTEST_CMAKE_GENERATOR "MinGW Makefiles") @@ -187,7 +187,7 @@ if (NOT DEFINED HPC) endif () ## Set the following to unique id your computer ## if (APPLE) - set (CTEST_SITE "MAC.XXXX") + set (CTEST_SITE "MAC.XXXX") else () set (CTEST_SITE "LINUX.XXXX") endif () |