From 845dd138700847d24228c9b6575bcdd4ca1121bf Mon Sep 17 00:00:00 2001 From: Stinkfist0 Date: Thu, 20 Apr 2017 20:32:09 +0300 Subject: [PATCH] Windows/MSVC: Fix OCCT deployment on VS 2017. --- win/build-deps.cmd | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 33604c53ef..cb97869a06 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -299,9 +299,14 @@ call :InstallCMakeProject "%DEPENDENCY_DIR%\%BUILD_DIR%" %BUILD_CFG% if not %ERRORLEVEL%==0 goto :Error :: 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%" -move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%\libi\*.*" "%OCC_LIBRARY_DIR%" -move /y "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%\libd\*.*" "%OCC_LIBRARY_DIR%" -rmdir /s /q "%INSTALL_DIR%\opencascade\win%ARCH_BITS%\vc%VC_VER%" +:: NOTE OCCT (at least occt-V7_0_0-9059ca1) directory creation code is hardcoded and doesn't seem handle future VC versions +set OCCT_VC_VER=%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 rmdir /s /q "%INSTALL_DIR%\opencascade\data" rmdir /s /q "%INSTALL_DIR%\opencascade\samples"