spns #41843: use of built-in nlopt when python3-nlopt package is not avail

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 001a1b30157c12a723e486db5952a5731ff8c8ae..8371de6ca3755d0c6bb0f1dce134489ba438f75e 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -234,6 +234,7 @@ __overwrite__ :
         #   - Qt minimal version 5.12
         #   - xmlpatterns executable
         __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.products.nlopt'    : '2.4.2'
         'APPLICATION.products.opencv'   : '3.2.0'
         'APPLICATION.products.cminpack' : 'native'
         'APPLICATION.products.hdf5'     : 'native'
@@ -305,6 +306,7 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
+        'APPLICATION.products.nlopt'            : '2.4.2'
         'APPLICATION.products.opencv'           : '3.2.0'
         'APPLICATION.products.qwt'              : '6.1.4'
         'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'   }
@@ -313,6 +315,7 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD34']"
+        'APPLICATION.products.nlopt'     : '2.4.2'
         'APPLICATION.products.opencv'    : '3.2.0'
         'APPLICATION.products.qwt'       : '6.1.6'
         'APPLICATION.products.omniORB'   : '4.2.5'
@@ -323,6 +326,7 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['FD36']"
+        'APPLICATION.products.nlopt'            : '2.4.2'
         'APPLICATION.products.opencv'           : {tag: '3.2.0',     base: 'no', section: 'version_3_2_0_FD36'                  }
         'APPLICATION.products.omniORB'          : '4.2.5'
         'APPLICATION.products.omniORBpy'        : '4.2.5'

diff --git a/products/nlopt.pyconf b/products/nlopt.pyconf
index 35677849ae5fe56ea7cd6a516b87f9cf88668485..9f22871e288cda99e8eb0ca48183a9aba52bb0c7 100644 (file)
--- a/products/nlopt.pyconf
+++ b/products/nlopt.pyconf
@@ -6,9 +6,9 @@ default :
     get_source : "archive"
     system_info :
     {
-       rpm     : ["NLopt"]
+       rpm     : ["NLopt","python3-NLopt"]
        rpm_dev : ["NLopt-devel"]
-       apt     : ["libnlopt0","libnlopt-cxx0"]
+       apt     : ["libnlopt0","libnlopt-cxx0","python3-nlopt"]
        apt_dev : ["libnlopt-dev","libnlopt-cxx-dev" ]
     }
     environ :