change branch

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 49649aed9e57c63bcd0e0c295718d88c617253f7..02c1d92d717af100d76e83b040568f8604501dd3 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -148,8 +148,8 @@ APPLICATION :
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
         'GEOM'
-        'SMESH'
-        'NETGENPLUGIN' : 'asozinov/32536_port'
+        'SMESH' : 'V9_10_0a2'
+        'NETGENPLUGIN' : 'asozinov/32536'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
         'GHS3DPRLPLUGIN'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index c604a1ba9fe6a7a7c5f4072a2f3de2e75ece1697..0a9ba41cfd4801eec1f4acec7244166e3b41da5b 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -144,8 +144,8 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH'
-        'NETGENPLUGIN' : 'asozinov/32536_port'
+        'SMESH' : 'V9_10_0a2'
+        'NETGENPLUGIN' : 'asozinov/32536'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
         'HYBRIDPLUGIN'

diff --git a/products/netgen.pyconf b/products/netgen.pyconf
index e912a1cdd43e62352c9bd0c382e5e1c26b204a5c..d5a7a3ab7a9b41726525164b9ba412943146d76e 100644 (file)
--- a/products/netgen.pyconf
+++ b/products/netgen.pyconf
@@ -28,7 +28,7 @@ version_6_2_2204 :
 {
    build_source : "cmake"
    cmake_options : " -DUSE_GUI=OFF -DUSE_PYTHON=OFF -DUSE_MPI=OFF -DUSE_OCC=ON -DUSE_INTERNAL_TCL=OFF -DBUILD_STUB_FILES=OFF -DOCC_INCLUDE_DIR=$CAS_ROOT_DIR/include/opencascade -DOCC_LIBRARY_DIR=$CAS_ROOT_DIR/lib -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_STANDARD=17  -DUSE_NATIVE_ARCH=OFF "
-   patches : ['netgen-6.2.2204-for-SALOME.patch']
+   patches : ['netgen-6.2.2204-for-SALOME.patch']#, 'netgen-6.2.2204-revert-CAS-find.patch]
    properties :
    {
      incremental : "yes"