X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2FGEOM.pyconf;h=2c8d85a177fe976ec643c647a847a9b4b775c39b;hb=207467198be9c1ba66243c84880b12ee6b3912a6;hp=efa7d1b788b2321a95f7ba1d3ff038a4e4d1dd9b;hpb=151b23b8199c2d4e9fff7f54521d2bd29ad23465;p=tools%2Fsat_salome.git diff --git a/products/GEOM.pyconf b/products/GEOM.pyconf index efa7d1b..2c8d85a 100644 --- a/products/GEOM.pyconf +++ b/products/GEOM.pyconf @@ -55,7 +55,7 @@ default_win : cmake_options : " -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DSALOME_GEOM_USE_OPENCV=ON -DOPENCV_ROOT_DIR=%OPENCV_ROOT_DIR:\=/% -DOpenCV_INCLUDE_DIRS=%OpenCV_INCLUDE_DIRS:\=/% " } -version_9_3_0_to_9_6_0 : +version_V9_4_0_to_V9_6_0 : { depend : ["KERNEL", "GUI", @@ -77,7 +77,36 @@ version_9_3_0_to_9_6_0 : ] } -_from_8_5_0_to_9_2_1 : # these versions requires the path geom_8.5.0_xao_data_dir.patch (for salome test) +version_V9_3_0 : +{ + depend : ["KERNEL", + "GUI", + "boost", + "CAS", + "Python", + "hdf5", + "omniORB", + "qt", + "ParaView", + "docutils", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "opencv", + "six", + "pytz" + ] + patches : [] +} + +version_V9_3_0_win : +{ + # backporting the opencv 3.2 patch - since windows uses this version of OpenCV + patches : ['GEOM-9.3.0-opencv_windows.patch'] +} + +version_V8_5_0_to_V9_2_1 : # these versions requires the path geom_8.5.0_xao_data_dir.patch (for salome test) { patches : [ "geom_8.5.0_xao_data_dir.patch" @@ -102,6 +131,28 @@ _from_8_5_0_to_9_2_1 : # these versions requires the path geom_8.5.0_xao_data_d ] } +version_V7_5_0_to_V7_8_3 : +{ + depend : ["KERNEL", + "GUI", + "boost", + "CAS", + "Python", + "hdf5", + "omniORB", + "qt", + "ParaView", + "docutils", + "Sphinx", + "Jinja2", + "setuptools", + "Pygments", + "opencv", + "six", + "pytz", + ] +} + version_V6_6_0 : { build_source : "autotools"