From 7e7c54a53545a175fd760ccbe8bd5ad5e535207d Mon Sep 17 00:00:00 2001 From: aothms Date: Fri, 21 Jan 2022 12:13:58 +0000 Subject: [PATCH] #1993 vs2022 hdf5 --- win/build-deps.cmd | 1 + win/patches/hdf5vs2022.patch | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 win/patches/hdf5vs2022.patch diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 12a0a546c8..3b1d16863b 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -203,6 +203,7 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error call :ExtractArchive %HDF5_CMAKE_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%" IF NOT %ERRORLEVEL%==0 GOTO :Error pushd "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%" +git apply ~dp0patches\hdf5vs2022.patch ctest -S HDF5config.cmake,BUILD_GENERATOR=VS%VS_VER%%ARCH_BITS_64% -C %BUILD_CFG% -V -O hdf5.log call :ExtractArchive %HDF5_INSTALL_ZIP_NAME%.zip "%INSTALL_DIR%" "%INSTALL_DIR%\%HDF5_INSTALL_ZIP_NAME%" popd diff --git a/win/patches/hdf5vs2022.patch b/win/patches/hdf5vs2022.patch new file mode 100644 index 0000000000..e5a803f47f --- /dev/null +++ b/win/patches/hdf5vs2022.patch @@ -0,0 +1,23 @@ +--- HDF5config.cmake 2021-02-05 14:38:05.000000000 +0000 ++++ HDF5config.cmake 2022-01-21 10:41:19.705646800 +0000 +@@ -110,7 +110,19 @@ + if (WIN32 AND NOT MINGW) + set (SITE_OS_NAME "Windows") + set (SITE_OS_VERSION "WIN10") +- if (BUILD_GENERATOR STREQUAL "VS201964") ++ if (BUILD_GENERATOR STREQUAL "VS202264") ++ set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022") ++ set (CMAKE_GENERATOR_ARCHITECTURE "x64") ++ set (SITE_OS_BITS "64") ++ set (SITE_COMPILER_NAME "vs2022") ++ set (SITE_COMPILER_VERSION "17") ++ elseif (BUILD_GENERATOR STREQUAL "VS2022") ++ set (CTEST_CMAKE_GENERATOR "Visual Studio 17 2022") ++ set (CMAKE_GENERATOR_ARCHITECTURE "Win32") ++ set (SITE_OS_BITS "32") ++ set (SITE_COMPILER_NAME "vs2022") ++ set (SITE_COMPILER_VERSION "17") ++ elseif (BUILD_GENERATOR STREQUAL "VS201964") + set (CTEST_CMAKE_GENERATOR "Visual Studio 16 2019") + set (CMAKE_GENERATOR_ARCHITECTURE "x64") + set (SITE_OS_BITS "64")