Fix openturns build - avoid native swig (UB16) and avoid native nlopt (native UB20...

diff --git a/products/compil_scripts/openturns.sh b/products/compil_scripts/openturns.sh
index d51bb226ef0db135435991cc5235b5c7372f3959..3a787d116f5346dd4ec3ccaf2386fa0dd322ab08 100755 (executable)
--- a/products/compil_scripts/openturns.sh
+++ b/products/compil_scripts/openturns.sh
@@ -8,6 +8,7 @@ CMAKE_OPTIONS=""
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHON_ROOT_DIR}/bin/python"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 
 echo
 echo "*** cmake" $CMAKE_OPTIONS

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index fa3efc3adfc2c90853e5c25564d4e9c4cb980620..ef1834851c4a34750cfbf93d28ffa98f1dc22eb8 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -28,5 +28,5 @@ default_win :
 
 version_1_16 :
 {
-    patches : ['openturns-1.16.0001.patch']
+    patches : ['openturns-1.16.0001.patch', 'openturns_nlopt.patch']
 }

diff --git a/products/patches/openturns_nlopt.patch b/products/patches/openturns_nlopt.patch
new file mode 100644 (file)
index 0000000..bd99012
--- /dev/null
+++ b/products/patches/openturns_nlopt.patch
@@ -0,0 +1,11 @@
+--- new_openturns/CMakeLists.txt       2021-04-08 17:38:10.804000000 +0200
++++ openturns/CMakeLists.txt   2021-04-08 18:08:15.428000000 +0200
+@@ -268,7 +268,7 @@
+ endif ()
+ 
+ if (USE_NLOPT)
+-#  find_package (NLopt CONFIG QUIET)
++  find_package (NLopt CONFIG QUIET)
+   if (NLopt_FOUND)
+     message(STATUS "Found NLopt: ${NLopt_DIR}")
+   else ()