GMSH: debug mode

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index f641cffbf461e5616115254a15aad2e5ad64ab04..39bdd8e80a4942bfda3a92b40fe33e2ce430895f 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -55,7 +55,7 @@ APPLICATION :
         f2c : '1.0.0'
         freeimage : '3.18.0'
         freetype : '2.9.1'
-        #gmsh : '4.1.4'
+        gmsh : '4.8.4'
         graphviz : '2.44.1'
         hdf5 : '1.10.3'
         idna : '2.8'
@@ -143,7 +143,7 @@ APPLICATION :
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
-        #'GMSHPLUGIN'
+        'GMSHPLUGIN'
         'HEXABLOCK'
         'HEXABLOCKPLUGIN'
         #'HOMARD'
@@ -164,7 +164,7 @@ APPLICATION :
         'ADAO'
         'PARAVISADDONS'
         'TESTBASE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {

diff --git a/products/compil_scripts/gmsh-4.8.4.bat b/products/compil_scripts/gmsh-4.8.4.bat
index c27db8e480b0a7548a140043ff0b225f3e725cdc..1b9e795afdd773f2bb41e2a5a976c5a14e05894e 100644 (file)
--- a/products/compil_scripts/gmsh-4.8.4.bat
+++ b/products/compil_scripts/gmsh-4.8.4.bat
@@ -4,6 +4,14 @@ echo ##########################################################################
 echo gmsh %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+SET PRODUCT_BUILD_TYPE=Release
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=Debug
+)
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include
@@ -15,7 +23,7 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=Release
+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
@@ -49,11 +57,11 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 
-msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild gmsh.vcxproj
     exit 2
@@ -65,7 +73,7 @@ echo *** installation...
 echo *********************************************************************
 echo.
 
-msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj
+msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild INSTALL.vcxproj
     exit 3
@@ -76,14 +84,14 @@ echo *********************************************************************
 echo *** installation Headers...
 echo *********************************************************************
 echo.
-msbuild  /p:Configuration=Release /p:Platform=x64  /p:BuildProjectReferences=false get_headers.vcxproj
+msbuild  /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64  /p:BuildProjectReferences=false get_headers.vcxproj
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on msbuild get_headers.vcxproj
     exit 4
 )
 
-copy /Y /B %BUILD_DIR%\Release\gmsh.lib %PRODUCT_INSTALL%\bin\gmsh.lib
-copy /Y /B %BUILD_DIR%\Release\gmsh.exp %PRODUCT_INSTALL%\bin\gmsh.exp
+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
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 FOR %%f IN (gmsh.h gmsh.h_cwrap gmshc.h) do (