X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2FSMESH.pyconf;h=c479b231f9a5c0075a862f0ddeea134d4a35bb02;hb=00f6c849e6d2d97d7608c131008afb4b5441bc60;hp=3d9963a1098a4be78ce7f84e80d46a623c96b303;hpb=a5473b802b04a4dc580a4262e4dc37a173776ada;p=tools%2Fsat_salome.git

diff --git a/products/SMESH.pyconf b/products/SMESH.pyconf
index 3d9963a..c479b23 100644
--- a/products/SMESH.pyconf
+++ b/products/SMESH.pyconf
@@ -42,6 +42,7 @@ default :
               "tbb"
              ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
+    opt_depend : ['SHAPERSTUDY']
     patches : []
     check_install : ["share/doc/salome/gui/SMESH/yams/index.html"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
@@ -86,7 +87,6 @@ default_win :
               "tbb"
             ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit", "f2c"]
-    patches : ['BOS-24228.patch']
 }
 
 default_MPI :
@@ -120,8 +120,50 @@ default_MPI :
              ]
 }
 
+version_topo2volmesh:
+{
+   patches : ['smesh_spns-19079_topo2volmesh.patch']
+}
+
+version_V9_3_0 :
+{
+    cmake_options : "-DSALOME_SMESH_USE_CGNS:BOOL=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF"
+    depend : ["KERNEL",
+              "GUI",
+              "GEOM",
+              "MEDCOUPLING",
+              "Python",
+              "qt",
+              "PyQt",
+              "boost",
+              "CAS",
+              "hdf5",
+              "medfile",
+              "qwt",
+              "ParaView",
+              "libxml2",
+              "omniORB",
+              "docutils",
+              "Sphinx",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "cgns",
+              "six",
+              "pytz",
+              "sphinxintl",
+              "sphinxcontrib_napoleon"
+             ]
+    patches : []
+}
+
+version_V9_3_0_win :
+{
+    cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_SMESH_USE_CGNS:BOOL=ON -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF"
+}
+
 # Starting from SALOME 9.4.0, we use tbb as product and build SMESH using it to accelerate its performances
-version_8_5_0_to_9_3_0 :
+version_8_5_0_to_9_2_1 :
 {
     cmake_options : "-DSALOME_SMESH_USE_CGNS:BOOL=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_SMESH_DYNLOAD_LOCAL:BOOL=ON -DSALOME_SMESH_BUILD_FRENCH_DOC=OFF"
     depend : ["KERNEL",
@@ -185,7 +227,6 @@ version_7_8_0_to_8_4_0 :
               "pytz"
              ]
     nb_proc : 8
-    patches : []
 }
 
 version_V6_6_0 :