X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2Fcompil_scripts%2Fgmsh-4.8.4.bat;h=2fbabf65170f83c63bd415f34b2566a04bd940ca;hb=5e6f783af4f89b0f42f9b617034fdbe6abf6b6c8;hp=1b9e795afdd773f2bb41e2a5a976c5a14e05894e;hpb=6edf1e39fd770b0ad0435caa088c56ad8ec044d5;p=tools%2Fsat_salome.git

diff --git a/products/compil_scripts/gmsh-4.8.4.bat b/products/compil_scripts/gmsh-4.8.4.bat
index 1b9e795..2fbabf6 100644
--- a/products/compil_scripts/gmsh-4.8.4.bat
+++ b/products/compil_scripts/gmsh-4.8.4.bat
@@ -9,8 +9,10 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 SET PRODUCT_BUILD_TYPE=Release
+SET BUILD_SHARED=ON
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
+  set BUILD_SHARED=OFF
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -25,8 +27,8 @@ cd %BUILD_DIR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_LIB=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_SHARED=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_DYNAMIC=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_SHARED=%BUILD_SHARED%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_DYNAMIC=%BUILD_SHARED%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ACIS=OFF 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_FLTK=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ONELAB_METAMODEL=OFF
@@ -34,13 +36,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PARSER=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PETSC=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PRIVATE_API=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_HXT=OFF 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_SOLVER=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_GMM=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING="Visual Studio 15 2017 Win64"
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BLAS_LAPACK=OFF
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
@@ -90,8 +88,8 @@ if NOT %ERRORLEVEL% == 0 (
     exit 4
 )
 
-copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\gmsh.lib %PRODUCT_INSTALL%\bin\gmsh.lib
-copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\gmsh.exp %PRODUCT_INSTALL%\bin\gmsh.exp
+copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.lib %PRODUCT_INSTALL%\bin
+copy /Y /B %BUILD_DIR%\%PRODUCT_BUILD_TYPE%\*.exp %PRODUCT_INSTALL%\bin
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 FOR %%f IN (gmsh.h gmsh.h_cwrap gmshc.h) do (
@@ -118,6 +116,9 @@ ENDLOCAL
 
 REM these two files need to be moved to bin, adding bin directory to PATH does not help.
 cp %PRODUCT_INSTALL%\lib\gmsh.py %PRODUCT_INSTALL%\bin\gmsh.py
-cp %PRODUCT_INSTALL%\lib\gmsh.dll %PRODUCT_INSTALL%\bin\gmsh.dll
+if %SAT_DEBUG% == 0 (
+  cp %PRODUCT_INSTALL%\lib\gmsh.dll %PRODUCT_INSTALL%\bin\gmsh.dll
+)
+
 echo.
 echo ########## END