merge from master

[tools/sat_salome.git] / products / GUI.pyconf

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index 641279bd326fe44b7bb3ba57cd723ab0d3132f70..2f0c58100490da8c1833f5485c1eb4103a4565ef 100644 (file)
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "GUI"
     build_source : "cmake"
-    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSIP_INCLUDE_DIR=${SIP_ROOT_DIR}"
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
     get_source : "git"
     git_info:
     {
@@ -28,10 +28,9 @@ default :
               "omniORB",
               "docutils",
               "libxml2",
-              "sphinxintl",
-              "sphinxcontrib_napoleon"
+              "sphinxintl"
            ]
-    opt_depend : ["sphinx_rtd_theme"]
+    opt_depend : ["sphinx_rtd_theme", "openmpi"]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -66,7 +65,6 @@ default_win :
               "sphinxcontrib_websupport",
               "sphinxcontrib_applehelp",
               "sphinxcontrib_serializinghtml",
-              "sphinxcontrib_napoleon",
               "graphviz"
              ]
     opt_depend : ["sphinx_rtd_theme"]
@@ -76,11 +74,13 @@ default_win :
 
 version_V9_5_0:
 {
-  patches: ['gui-SVTK-VTKView.patch'] # backporting bos #19139
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    patches: ['gui-SVTK-VTKView.patch'] # backporting bos #19139
 }
 
 version_8_5_0_to_9_4_0 :
 {
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
     depend : ["KERNEL",
               "Python",
               "qt",
@@ -130,12 +130,45 @@ version_9_4_0_win:
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
+version_V9_3_0_win :
+{
+    depend : ["KERNEL",
+              "Python",
+              "qt",
+              "sip",
+              "PyQt",
+              "boost",
+              "CAS",
+              "qwt",
+              "hdf5",
+              "freetype",
+              "freeimage",
+              "gl2ps",
+              "ParaView",
+              "omniORB",
+              "docutils",
+              "libxml2",
+              "sphinxintl",
+              "sphinxcontrib_websupport",
+              "sphinxcontrib_applehelp",
+              "sphinxcontrib_serializinghtml",
+              "sphinxcontrib_napoleon"
+             ]
+    build_depend : ["cmake", "swig", "doxygen", "cppunit"]
+    patches : ['GUI-V9_3_0-LightApplication_windows.patch']
+}
+
+version_9_2_0_PPGP:
+{
+  patches: ['GUI-V9_2_0-visualCode.patch']
+}
+
 # OP 19/04/2018 Add section for SALOME 7.8.0 to 8.4.0 due to new dependencies in SALOME 8.5.0
 version_7_8_0_to_8_4_0 :
 {
     name : "GUI"
     build_source : "cmake"
-    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig "
     get_source : "git"
     git_info:
     {