From 7f5d733ed87f6ab7be784ec0f6e6bca5bb5cce7b Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sun, 22 Sep 2019 12:57:36 +0200 Subject: [PATCH] Propagate static runtime settings to voxel tk --- win/build-deps.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index b09ed33d47..4fd90a9cac 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -391,11 +391,14 @@ set DEPENDENCY_DIR=%DEPS_DIR%\voxel call :GitCloneAndCheckoutRevision https://github.com/opensourceBIM/voxelization_toolkit.git "%DEPENDENCY_DIR%" IF NOT %ERRORLEVEL%==0 GOTO :Error cd "%DEPENDENCY_DIR%" +if NOT "%USE_STATIC_RUNTIME%"=="FALSE" set STATIC_RUNTIME_1=-DUSE_STATIC_MSVC_RUNTIME=1 +if "%USE_STATIC_RUNTIME%"=="FALSE" set STATIC_RUNTIME_1=-DUSE_STATIC_MSVC_RUNTIME=0 call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\voxel" ^ -DIFC_SUPPORT=Off ^ -DOCC_INCLUDE_DIR="%OCC_INCLUDE_DIR%" ^ -DOCC_LIBRARY_DIR="%OCC_LIBRARY_DIR%" ^ -DBOOST_ROOT="%DEPS_DIR%\boost_%BOOST_VER%" ^ + %STATIC_RUNTIME_1% ^ -DBOOST_LIBRARYDIR="%DEPS_DIR%\boost_%BOOST_VER%\stage\vs%VS_VER%-%VS_PLATFORM%\lib" IF NOT %ERRORLEVEL%==0 GOTO :Error call :BuildSolution "%DEPENDENCY_DIR%\%BUILD_DIR%\voxel.sln" %BUILD_CFG%