improve debug build - windows

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 18e641279e016414906edf05d5873ae022f80677..ed792031f19618469c742e57d30b411187019ca3 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -8,9 +8,9 @@ APPLICATION :
     cmake_generator : 'Visual Studio 15 2017 Win64'
     tag : 'master'
     dev : 'no'
     cmake_generator : 'Visual Studio 15 2017 Win64'
     tag : 'master'
     dev : 'no'

-    verbose :'no'
-    debug : 'no'
-    base : 'no'
+    verbose : 'no'
+    debug   : 'no'
+    base    : 'no'

     python3 : 'yes'
     environ :
     {
     python3 : 'yes'
     environ :
     {


@@ -208,5 +208,6 @@ __overwrite__ :
     'APPLICATION.products.omniORB'    : {tag: '4.2.3',   base: 'no', section : 'version_4_2_3_win_dbg'      }
     'APPLICATION.products.psutil'     : {tag: '5.7.2',   base: 'no', section : 'version_5_7_2_win_dbg'      }
     'APPLICATION.products.ParaView'   : {tag: '5.9.0',   base: 'no', section : 'version_5_9_0_win_dbg'      }
     'APPLICATION.products.omniORB'    : {tag: '4.2.3',   base: 'no', section : 'version_4_2_3_win_dbg'      }
     'APPLICATION.products.psutil'     : {tag: '5.7.2',   base: 'no', section : 'version_5_7_2_win_dbg'      }
     'APPLICATION.products.ParaView'   : {tag: '5.9.0',   base: 'no', section : 'version_5_9_0_win_dbg'      }

+    'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }

   }
 ]
   }
 ]

diff --git a/products/EFICAS_TOOLS.pyconf b/products/EFICAS_TOOLS.pyconf
index 5e4d26fcae4b8c3d004fc36f140ae8cfc67fcf28..4ce2231be7c68c5ff81a0d957d9aa16e24094df9 100644 (file)
--- a/products/EFICAS_TOOLS.pyconf
+++ b/products/EFICAS_TOOLS.pyconf
@@ -27,5 +27,6 @@ default :
 default_win :
 {
     build_source : "cmake"
 default_win :
 {
     build_source : "cmake"

+    depend : ['PyQt', 'Sphinx', 'zlib']

     cmake_options : ' -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/%  -DWITH_TELEMAC_CATA=ON -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DBUILD_DOC=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR:\=/%   -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR:\=/%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib -DPYUIC5=%PYUIC5:\=/%'
 }
     cmake_options : ' -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/%  -DWITH_TELEMAC_CATA=ON -DSALOME_GUI_BUILD_WITH_QT5:BOOL=ON -DBUILD_DOC=ON -DPYTHON_ROOT_DIR=%PYTHON_ROOT_DIR:\=/%   -DPYTHON_INCLUDE_PATH:STRING=%PYTHON_ROOT_DIR:\=/%/include -DPYTHON_LIBRARY=%PYTHON_ROOT_DIR:\=/%/libs/python%PYTHON_VERSION:.=%.lib -DPYUIC5=%PYUIC5:\=/%'
 }

diff --git a/products/PARAVIS.pyconf b/products/PARAVIS.pyconf
index 992734de00c0440df8c918680b2765799077e252..6c366d00f524d92570fb5a536482802664f7d1ce 100644 (file)
--- a/products/PARAVIS.pyconf
+++ b/products/PARAVIS.pyconf
@@ -67,7 +67,8 @@ default_win:
        "docutils",
        "libxml2",
        "six",
        "docutils",
        "libxml2",
        "six",

-       "pytz"
+       "pytz",
+       "sphinxintl"

     ]
 }
 
     ]
 }
 

diff --git a/products/zlib.pyconf b/products/zlib.pyconf
index 93a9ac182830b1c0053ea6ac47f1a8168f281540..b92d1baad2bd58413a3a98b74d299a81c7f1bd7c 100755 (executable)
--- a/products/zlib.pyconf
+++ b/products/zlib.pyconf
@@ -47,3 +47,14 @@ version_1_2_5_win:
    archive_info : {archive_name : "zlib-" + $APPLICATION.products.zlib + ".tar.gz"}
    compil_script : 'zlib-1.2.5.bat'
 }
    archive_info : {archive_name : "zlib-" + $APPLICATION.products.zlib + ".tar.gz"}
    compil_script : 'zlib-1.2.5.bat'
 }

+
+version_1_2_5_win_dbg:
+{
+   archive_info : {archive_name : "zlib-1.2.5.tar.gz"}
+   compil_script : 'zlib-1.2.5.bat'
+   properties:
+   {
+     incremental : "yes"
+     single_install_dir : "no"
+   }
+}