Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 15:08:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1993 vs2022 hdf5

Browse Source
This commit is contained in:
aothms
2022-01-21 12:13:58 +00:00
parent 817fdead9b
commit 7e7c54a535
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps.cmd
+1
View File
@@ -203,6 +203,7 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error
call :ExtractArchive %HDF5_CMAKE_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%" call :ExtractArchive %HDF5_CMAKE_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%"
IF NOT %ERRORLEVEL%==0 GOTO :Error IF NOT %ERRORLEVEL%==0 GOTO :Error
pushd "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%" 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 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%" call :ExtractArchive %HDF5_INSTALL_ZIP_NAME%.zip "%INSTALL_DIR%" "%INSTALL_DIR%\%HDF5_INSTALL_ZIP_NAME%"
popd popd
win/patches/hdf5vs2022.patch
+23
View File
@@ -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")