mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-24 11:06:51 +00:00
Windows/MSVC: Fix OCCT deployment on VS 2017.
This commit is contained in:
committed by
Thomas Krijnen
parent
d713b7e06a
commit
845dd13870
+8
-3
@@ -299,9 +299,14 @@ call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG%
|
|||||||
if not %ERRORLEVEL%==0 goto :Error
|
if not %ERRORLEVEL%==0 goto :Error
|
||||||
:: Use a single lib directory for for release and debug libraries as is done with OCE
|
:: Use a single lib directory for for release and debug libraries as is done with OCE
|
||||||
if not exist "%OCC_LIBRARY_DIR%". mkdir "%OCC_LIBRARY_DIR%"
|
if not exist "%OCC_LIBRARY_DIR%". mkdir "%OCC_LIBRARY_DIR%"
|
||||||
move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%\libi\*.*" "%OCC_LIBRARY_DIR%"
|
:: NOTE OCCT (at least occt-V7_0_0-9059ca1) directory creation code is hardcoded and doesn't seem handle future VC versions
|
||||||
move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%\libd\*.*" "%OCC_LIBRARY_DIR%"
|
set OCCT_VC_VER=%VC_VER%
|
||||||
rmdir /s /q "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%"
|
IF %OCCT_VC_VER% GTR 14 (
|
||||||
|
set OCCT_VC_VER=14
|
||||||
|
)
|
||||||
|
move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%OCCT_VC_VER%\libi\*.*" "%OCC_LIBRARY_DIR%"
|
||||||
|
move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%OCCT_VC_VER%\libd\*.*" "%OCC_LIBRARY_DIR%"
|
||||||
|
rmdir /s /q "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%OCCT_VC_VER%"
|
||||||
:: Removed unneeded bits
|
:: Removed unneeded bits
|
||||||
rmdir /s /q "%INSTALL_DIR%\opencascade\data"
|
rmdir /s /q "%INSTALL_DIR%\opencascade\data"
|
||||||
rmdir /s /q "%INSTALL_DIR%\opencascade\samples"
|
rmdir /s /q "%INSTALL_DIR%\opencascade\samples"
|
||||||
|
|||||||
Reference in New Issue
Block a user