spns #34285 : Add patch for NLopt

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index efb3202845188c197d39b1f5d5ae6bed34561a07..5e4fa92d5a144c6c3b56e4c7fb503a9b4c6ec07f 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -91,7 +91,7 @@ APPLICATION :
         opencv : 'native'
         openmpi: 'native'
         openVKL : '0.11.0'
-        openturns: '1.19'
+        openturns: '1.20'
         ospray : '2.4.0'
         packaging : 'native'
         packagespy : '74152cd'
@@ -212,7 +212,7 @@ __overwrite__ :
         'APPLICATION.products.cminpack'         : 'native'
         'APPLICATION.products.netcdf'           : '4.6.2'
         'APPLICATION.products.PyFMI'            : {tag: '2.6',   base: 'no', section: 'version_2_6_no_pip'      }
-        'APPLICATION.products.openturns'        : {tag: '1.19',  base: 'no', section: 'version_1_19_UB20_04'    }
+        #'APPLICATION.products.openturns'        : {tag: '1.19',  base: 'no', section: 'version_1_19_UB20_04'    }
         'APPLICATION.products.scipy'            : {tag: '1.5.2', base: 'no', section: 'version_1_5_2_no_pip'    } # scipy >= 1.4 - system one too old
     }
     {

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index a93e60d02e154bf18ae0a9943fa97784c9585de2..d15036c0d8754605010854d7116044cf11fb21b9 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -38,29 +38,17 @@ default_win :
 version_1_20 :
 {
     compil_script :  "openturns-1.20" + $VARS.scriptExtension
+    patches : []
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
-    patches : []
-}
-
-version_1_20_win :
-{
-    properties :
-    {
-      incremental : "yes"
-      pip : "yes"
-    }
-    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads', 'dill', 'psutil']
-    opt_depend : []
-    patches : []
 }
 
-version_1_20_DB09 :
+version_1_20_UB20_04 :
 {
     compil_script :  "openturns-1.20" + $VARS.scriptExtension
+    patches : ['openturns-1.20.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
-    patches : ['openturns-1.20.0001.patch']
 }
 
 version_1_19 :

diff --git a/products/patches/openturns-1.20.0002.patch b/products/patches/openturns-1.20.0002.patch
new file mode 100644 (file)
index 0000000..64965eb
--- /dev/null
+++ b/products/patches/openturns-1.20.0002.patch
@@ -0,0 +1,15 @@
+--- openturns_ref/openturns-1.20/CMakeLists.txt        2023-03-31 13:11:11.000000000 +0200
++++ openturns_dev/openturns-1.20/CMakeLists.txt        2023-04-05 11:34:07.224075227 +0200
+@@ -315,7 +315,11 @@
+ endif ()
+ 
+ if (USE_NLOPT)
+-  find_package (NLopt CONFIG QUIET)
++  SET(NLOPT_ROOT_DIR $ENV{NLOPT_ROOT_DIR} CACHE PATH "Path to the NLOPT.")
++  IF(NLOPT_ROOT_DIR)
++    LIST(APPEND CMAKE_PREFIX_PATH "${NLOPT_ROOT_DIR}")
++  ENDIF(NLOPT_ROOT_DIR)
++  find_package (NLopt)
+   if (NLopt_FOUND)
+     message(STATUS "Found NLopt: ${NLopt_DIR}  (found version \"${NLopt_VERSION}\")")
+   else ()