spns #34285 : rename and fix the two openturns patches

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index 906e854cfd4966319a4908961e29618569903e35..e0121a764312d3ff85280c14c688b66cb556d638 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -37,7 +37,7 @@ default_win :
 
 version_1_20_1 :
 {
-    compil_script :  "openturns-1.20" + $VARS.scriptExtension
+    compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
     patches : []
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
@@ -45,8 +45,8 @@ version_1_20_1 :
 
 version_1_20_1_UB22_04 :
 {
-    compil_script :  "openturns-1.20" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0002.patch']
+    compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
+    patches : ['openturns-1.20.1.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -54,7 +54,7 @@ version_1_20_1_UB22_04 :
 version_1_20_1_UB20_04 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0002.patch']
+    patches : ['openturns-1.20.1.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -62,7 +62,7 @@ version_1_20_1_UB20_04 :
 version_1_20_1_DB11 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0002.patch']
+    patches : ['openturns-1.20.1.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -70,7 +70,7 @@ version_1_20_1_DB11 :
 version_1_20_1_DB09 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0001.patch']
+    patches : ['openturns-1.20.1.0001.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -78,7 +78,7 @@ version_1_20_1_DB09 :
 version_1_20_1_CO8 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0001.patch']
+    patches : ['openturns-1.20.1.0001.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -86,7 +86,7 @@ version_1_20_1_CO8 :
 version_1_20_1_CO7 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0001.patch']
+    patches : ['openturns-1.20.1.0001.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -110,7 +110,7 @@ version_1_20_1_FD36 :
 version_1_20_1_FD34 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0002.patch']
+    patches : ['openturns-1.20.1.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }
@@ -118,7 +118,7 @@ version_1_20_1_FD34 :
 version_1_20_1_FD32 :
 {
     compil_script :  "openturns-1.20.1" + $VARS.scriptExtension
-    patches : ['openturns-1.20.0002.patch', 'openturns-1.20.0003.patch']
+    patches : ['openturns-1.20.1.0002.patch']
     depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
     opt_depend : ['pandas', 'statsmodels']
 }

diff --git a/products/patches/openturns-1.20.0001.patch b/products/patches/openturns-1.20.0001.patch
deleted file mode 100644 (file)
index e30a66f..0000000
--- a/products/patches/openturns-1.20.0001.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur openturns-1.20_ref/openturns-1.20/CMakeLists.txt  openturns-1.20_dev/openturns-1.20/CMakeLists.txt
---- openturns-1.20_ref/openturns-1.20/CMakeLists.txt   2023-03-31 13:11:11.000000000 +0200
-+++ openturns-1.20_dev/openturns-1.20/CMakeLists.txt   2023-04-04 10:35:09.815050125 +0200
-@@ -154,6 +154,10 @@
-   endif ()
- endif ()
- list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${LAPACK_LIBRARIES})
-+IF (DEFINED CBLAS_LIBRARIES)
-+  MESSAGE(STATUS "CBLAS_LIBRARIES is defined... adding to the list of libraries ${CBLAS_LIBRARIES}")
-+  LIST (APPEND OPENTURNS_PRIVATE_LIBRARIES ${CBLAS_LIBRARIES})
-+ENDIF()
- 
- if (USE_SPECTRA)
-   find_package (Spectra 1.0 CONFIG)

diff --git a/products/patches/openturns-1.20.0002.patch b/products/patches/openturns-1.20.0002.patch
deleted file mode 100644 (file)
index 64965eb..0000000
--- a/products/patches/openturns-1.20.0002.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 ()

diff --git a/products/patches/openturns-1.20.1.0001.patch b/products/patches/openturns-1.20.1.0001.patch
new file mode 100644 (file)
index 0000000..7c1372a
--- /dev/null
+++ b/products/patches/openturns-1.20.1.0001.patch
@@ -0,0 +1,14 @@
+diff -Naur openturns-1.20.1_ref/openturns-1.20.1/CMakeLists.txt  openturns-1.20.1_dev/openturns-1.20.1/CMakeLists.txt
+--- openturns-1.20.1_ref/openturns-1.20.1/CMakeLists.txt       2023-03-31 13:11:11.000000000 +0200
++++ openturns-1.20.1_dev/openturns-1.20.1/CMakeLists.txt       2023-04-04 10:35:09.815050125 +0200
+@@ -154,6 +154,10 @@
+   endif ()
+ endif ()
+ list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${LAPACK_LIBRARIES})
++IF (DEFINED CBLAS_LIBRARIES)
++  MESSAGE(STATUS "CBLAS_LIBRARIES is defined... adding to the list of libraries ${CBLAS_LIBRARIES}")
++  LIST (APPEND OPENTURNS_PRIVATE_LIBRARIES ${CBLAS_LIBRARIES})
++ENDIF()
+ 
+ if (USE_SPECTRA)
+   find_package (Spectra 1.0 CONFIG)

diff --git a/products/patches/openturns-1.20.1.0002.patch b/products/patches/openturns-1.20.1.0002.patch
new file mode 100644 (file)
index 0000000..d832e70
--- /dev/null
+++ b/products/patches/openturns-1.20.1.0002.patch
@@ -0,0 +1,15 @@
+--- openturns_ref/openturns-1.20.1/CMakeLists.txt      2023-03-31 13:11:11.000000000 +0200
++++ openturns_dev/openturns-1.20.1/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 ()