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 5d76b6f4de40d332cd38ab2e0b97897f69f9888c..5e86cf15c2ed26b283ac765313991cc9969967c9 100755
(executable)
--- a/
products/compil_scripts/MeshGems.bat
+++ b/
products/compil_scripts/MeshGems.bat
@@
-15,24
+15,29
@@
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
-xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q
\r
+xcopy include\* %PRODUCT_INSTALL%\include /E /I /Q
/Y
\r
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying include
\r
exit 1
\r
)
\r
\r
rem ## Lib
\r
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying include
\r
exit 1
\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.
\r
-echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q
\r
-xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q
\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
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying lib
\r
exit 2
\r
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying lib
\r
exit 2
\r
@@
-40,8
+45,8
@@
if NOT %ERRORLEVEL% == 0 (
\r
rem ## Bin
\r
echo.
\r
\r
rem ## Bin
\r
echo.
\r
-echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
\r
-xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
\r
+echo running command: bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
/Y
\r
+xcopy bin\%SRC_FOLDER%\* %PRODUCT_INSTALL%\bin /E /I /Q
/Y
\r
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying bin
\r
exit 3
\r
if NOT %ERRORLEVEL% == 0 (
\r
echo ERROR on copying bin
\r
exit 3
\r