From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 5 Jan 2022 14:02:25 +0000 (+0100)
Subject: spns #26899: MeshGems windows uses Visual C++ 2017
X-Git-Tag: V9_9_0~245
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fe502dd30b5c55c435ea36968ce2787c9055c739;p=tools%2Fsat_salome.git

spns #26899: MeshGems windows uses Visual C++ 2017
---

diff --git a/products/compil_scripts/MeshGems.bat b/products/compil_scripts/MeshGems.bat
index 21fc966..1a3e616 100755
--- a/products/compil_scripts/MeshGems.bat
+++ b/products/compil_scripts/MeshGems.bat
@@ -15,11 +15,10 @@ mkdir %BUILD_DIR%
 
 cd %SOURCE_DIR%
 
-set SRC_FOLDER=Win7_64_VC14
-
+set SRC_FOLDER_VC14=Win7_64_VC14
+set SRC_FOLDER_VC15=Win7_64_VC15
 cd DISTENE\MeshGems-*\Products
 
-echo SRC_FOLDER = %SRC_FOLDER%
 echo PRODUCT_INSTALL = %PRODUCT_INSTALL%
 
 rem ## Includes
@@ -30,6 +29,12 @@ if NOT %ERRORLEVEL% == 0 (
 )
 
 rem ## Lib
+set SRC_FOLDER=%SRC_FOLDER_VC15%
+if exist "%SRC_FOLDER_VC14%" (
+   set SRC_FOLDER=%SRC_FOLDER_VC14%
+)
+
+echo SRC_FOLDER = %SRC_FOLDER%
 echo. 
 echo running command: xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y
 xcopy lib\%SRC_FOLDER%\* %PRODUCT_INSTALL%\lib /E /I /Q /Y