spns #43020: vetoe irmb and mcut if c++ standard < c++20

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index fb2f8182059173bd4307d06e701a40d8f5b45b3c..46ad95ecbc8dec7d2153070fc526e58780ef1851 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -93,7 +93,7 @@ APPLICATION :
         mdurl: '0.1.2'
         medfile : '4.1.1'
         mesa : '19.0.8'
-        meshbooleanplugin : 'main'
+        meshbooleanplugin : {tag:'main', base:'no', section:'version_no_irmb_mcut'}
         MeshGems : '2.15-1'
         meshio : {tag: '5.3.5' , base: 'no', section : 'version_5_3_5_no_pip'}
         mpi4py : {tag: '3.1.0',  base: 'no', section : 'version_3_1_0_no_pip'}

diff --git a/products/meshbooleanplugin.pyconf b/products/meshbooleanplugin.pyconf
index 257cff00ebadc07a54760551de0f57560e4d6d02..39ff4142db90c522b9575518eedc3b18e96f0a81 100644 (file)
--- a/products/meshbooleanplugin.pyconf
+++ b/products/meshbooleanplugin.pyconf
@@ -43,3 +43,8 @@ default :
       single_install_dir : "no"
     }
 }
+
+version_no_irmb_mcut :
+{
+ patches: ['meshbooleanplugin-p01.irmb-mcut.patch'] # remove irmb and mcut since requires c++20
+}

diff --git a/products/patches/meshbooleanplugin-p01.irmb-mcut.patch b/products/patches/meshbooleanplugin-p01.irmb-mcut.patch
new file mode 100644 (file)
index 0000000..e97dca5
--- /dev/null
+++ b/products/patches/meshbooleanplugin-p01.irmb-mcut.patch
@@ -0,0 +1,26 @@
+diff --git a/MyPlugDialog.ui b/MyPlugDialog.ui
+index cd8875a..115e0a5 100644
+--- a/MyPlugDialog.ui
++++ b/MyPlugDialog.ui
+@@ -158,21 +158,11 @@
+              <string>vtk</string>
+             </property>
+            </item>
+-           <item>
+-            <property name="text">
+-             <string>irmb</string>
+-            </property>
+-           </item>
+            <item>
+             <property name="text">
+              <string>Cork</string>
+             </property>
+            </item>
+-           <item>
+-            <property name="text">
+-             <string>mcut</string>
+-            </property>
+-           </item>
+           </widget>
+          </item>
+          <item row="1" column="0">