Salome HOME
projects
/
tools
/
sat_salome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spns #26899: MeshGems windows uses Visual C++ 2017 - fix path
[tools/sat_salome.git]
/
products
/
compil_scripts
/
MeshGems.bat
diff --git
a/products/compil_scripts/MeshGems.bat
b/products/compil_scripts/MeshGems.bat
index 21fc9666a7522283499f353131a4012af9301e4e..5e86cf15c2ed26b283ac765313991cc9969967c9 100755
(executable)
--- a/
products/compil_scripts/MeshGems.bat
+++ b/
products/compil_scripts/MeshGems.bat
@@
-15,11
+15,10
@@
mkdir %BUILD_DIR%
\r
cd %SOURCE_DIR%
\r
\r
\r
cd %SOURCE_DIR%
\r
\r
-set SRC_FOLDER=Win7_64_VC14
\r
-
\r
+set SRC_FOLDER
_VC14
=Win7_64_VC14
\r
+set SRC_FOLDER_VC15=Win7_64_VC15
\r
cd DISTENE\MeshGems-*\Products
\r
\r
cd DISTENE\MeshGems-*\Products
\r
\r
-echo SRC_FOLDER = %SRC_FOLDER%
\r
echo PRODUCT_INSTALL = %PRODUCT_INSTALL%
\r
\r
rem ## Includes
\r
echo PRODUCT_INSTALL = %PRODUCT_INSTALL%
\r
\r
rem ## Includes
\r
@@
-30,6
+29,12
@@
if NOT %ERRORLEVEL% == 0 (
)
\r
\r
rem ## Lib
\r
)
\r
\r
rem ## Lib
\r
+set SRC_FOLDER=%SRC_FOLDER_VC15%
\r
+if exist "lib\%SRC_FOLDER_VC14%" (
\r
+ set SRC_FOLDER=%SRC_FOLDER_VC14%
\r
+)
\r
+
\r
+echo SRC_FOLDER = %SRC_FOLDER%
\r
echo.
\r
echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
\r
xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
\r
echo.
\r
echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
\r
xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
\r