Fix openturns patch (roll back to single one use)

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index ef1834851c4a34750cfbf93d28ffa98f1dc22eb8..fa3efc3adfc2c90853e5c25564d4e9c4cb980620 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', 'openturns_nlopt.patch']
+    patches : ['openturns-1.16.0001.patch']
 }

diff --git a/products/patches/openturns-1.16.0001.patch b/products/patches/openturns-1.16.0001.patch
index 57e30611114a0d80bc34db0d40949dbf31bec622..ec48c370b9aeacec16067bebf39cb7163fff5d05 100644 (file)
--- a/products/patches/openturns-1.16.0001.patch
+++ b/products/patches/openturns-1.16.0001.patch
@@ -53,6 +53,15 @@ diff -pruN openturns_ref/CMakeLists.txt openturns_dev/CMakeLists.txt
  if (MSVC OR WINTEL)
    set (CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/lib/include/pthread_win32 ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
    include_directories (${PROJECT_SOURCE_DIR}/lib/include/pthread_win32 ${CMAKE_CURRENT_SOURCE_DIR}/lib/include)
+@@ -257,7 +268,7 @@ if (NOT R_EXECUTABLE)
+ endif ()
+ 
+ if (USE_NLOPT)
+-  find_package (NLopt CONFIG QUIET)
++#  find_package (NLopt CONFIG QUIET)
+   if (NLopt_FOUND)
+     message(STATUS "Found NLopt: ${NLopt_DIR}")
+   else ()
 
 diff -pruN openturns_ref/cmake/FindTBB.cmake openturns_dev/cmake/FindTBB.cmake
 --- openturns_ref/cmake/FindTBB.cmake  2021-02-19 15:46:57.058060005 +0100