Propagate static runtime settings to voxel tk

This commit is contained in:
Thomas Krijnen
2019-09-22 12:57:36 +02:00
parent cdfbde8f18
commit 7f5d733ed8
+3
View File
@@ -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%