From: Quentin Cozette Date: Thu, 8 Apr 2021 17:57:36 +0000 (+0200) Subject: Fix openturns patch (roll back to single one use) X-Git-Tag: V9_7_0~63^2~19 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d8cde2648031355cceda7a98855d0c4fcdc3d7ac;p=tools%2Fsat_salome.git Fix openturns patch (roll back to single one use) --- diff --git a/products/openturns.pyconf b/products/openturns.pyconf index ef18348..fa3efc3 100644 --- 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 57e3061..ec48c37 100644 --- 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