From: asozinov <alexey.sozinov@opencascade.com>
Date: Mon, 7 Nov 2022 12:48:52 +0000 (+0300)
Subject: change branch
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c2a42c1d91f37cf0abc0576fc0f966a7f299c1a3;p=tools%2Fsat_salome.git

change branch
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 49649ae..02c1d92 100644
--- 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 c604a1b..0a9ba41 100644
--- 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 e912a1c..d5a7a3a 100644
--- 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"