From 2fe0ec061a2b81d97327a6a4820b212054974977 Mon Sep 17 00:00:00 2001 From: aothms Date: Fri, 5 Mar 2021 14:03:42 +0000 Subject: [PATCH] Fixes for windows build --- win/build-deps.cmd | 5 ++--- win/patches/V7_3_0p3.patch | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index c3565b3de8..d2f971d2a7 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -177,8 +177,7 @@ set HDF5_VERSION=1.8.22 set HDF5_VERSION_MAJOR=1.8 set HDF5_CMAKE_ZIP=CMake-hdf5-%HDF5_VERSION%.zip set HDF5_INSTALL_ZIP_NAME=HDF5-%HDF5_VERSION%-win%ARCH_BITS% -if "%ARCH_BITS%"==64. set ARCH_BITS_64=64 - +if "%ARCH_BITS%"=="64" set ARCH_BITS_64=64 call :DownloadFile http://support.hdfgroup.org/ftp/HDF5/releases/hdf5-%HDF5_VERSION_MAJOR%/hdf5-%HDF5_VERSION%/src/CMake-hdf5-%HDF5_VERSION%.zip "%DEPS_DIR%" %HDF5_CMAKE_ZIP% IF NOT %ERRORLEVEL%==0 GOTO :Error call :ExtractArchive %HDF5_CMAKE_ZIP% "%DEPS_DIR%" "%DEPS_DIR%\CMake-hdf5-%HDF5_VERSION%" @@ -304,7 +303,7 @@ if not %ERRORLEVEL%==0 goto :Error findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL if not %ERRORLEVEL%==0 ( pushd "%DEPENDENCY_DIR%" - git reset --hard --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch" + git apply --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch" popd ) findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL diff --git a/win/patches/V7_3_0p3.patch b/win/patches/V7_3_0p3.patch index efc9154b75..fdf57147ab 100644 --- a/win/patches/V7_3_0p3.patch +++ b/win/patches/V7_3_0p3.patch @@ -27,7 +27,7 @@ index 09da18d38..a07b9cf74 100644 +# set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") +# set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception") + -+if (MSVC) ++if (MSVC AND MSVC_STATIC_RUNTIME) + foreach(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL + CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)