From: Nicolas OTTON Date: Fri, 18 Mar 2022 15:09:17 +0000 (+0100) Subject: spns #29363 applying patch to older version as it was integrated to master X-Git-Tag: V9_9_0~132 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f90ddf5353bb379336337d8b80fdaaf0216ff39b;p=tools%2Fsat_salome.git spns #29363 applying patch to older version as it was integrated to master --- diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index 5fcc5ce..a716a80 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -45,7 +45,6 @@ default : has_unit_tests : "yes" } cmake_options : "-DCMAKE_CXX_FLAGS=-fpermissive -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON" - patches : ['patch_shaper_cursor_cross.diff'] } default_win : @@ -53,6 +52,11 @@ default_win : cmake_options : " -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe " } +version_9_5_0_to_9_8_0 : +{ + patches : ["patch_shaper_cursor_cross.diff"] +} + version_9_3_0_to_9_4_0 : { patches : [] diff --git a/products/YACS.pyconf b/products/YACS.pyconf index fdea20b..e94eb08 100644 --- a/products/YACS.pyconf +++ b/products/YACS.pyconf @@ -33,10 +33,6 @@ default : opt_depend : ['pmml'] build_depend : ["cmake", "swig", "doxygen", "cppunit"] - patches : [ - "yacs_cea_v2.patch" - ] - nb_proc : 4 source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name @@ -49,6 +45,11 @@ default : } } +version_9_2_0_to_9_8_0 : +{ + patches : ["yacs_cea_v2.patch"] +} + # bug in cmake for multi proc compilation from_7_7_0_to_8_5_0 : {