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

Fixes for windows build

Browse Source
This commit is contained in:
aothms
2021-03-05 14:03:42 +00:00
committed by Thomas Krijnen
parent a92ade7835
commit 2fe0ec061a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps.cmd
+2 -3
View File
@@ -177,8 +177,7 @@ set HDF5_VERSION=1.8.22
set HDF5_VERSION_MAJOR=1.8 set HDF5_VERSION_MAJOR=1.8
set HDF5_CMAKE_ZIP=CMake-hdf5-%HDF5_VERSION%.zip set HDF5_CMAKE_ZIP=CMake-hdf5-%HDF5_VERSION%.zip
set HDF5_INSTALL_ZIP_NAME=HDF5-%HDF5_VERSION%-win%ARCH_BITS% 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% 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 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%"
@@ -304,7 +303,7 @@ if not %ERRORLEVEL%==0 goto :Error
findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL
if not %ERRORLEVEL%==0 ( if not %ERRORLEVEL%==0 (
pushd "%DEPENDENCY_DIR%" pushd "%DEPENDENCY_DIR%"
git reset --hard --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch" git apply --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch"
popd popd
) )
findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL
win/patches/V7_3_0p3.patch
+1 -1
View File
@@ -27,7 +27,7 @@ index 09da18d38..a07b9cf74 100644
+# set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") +# set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
+# set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_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 + 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_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
+ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO) + CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)