spns #24377: FD32 - target lapack/blas system

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 962f7de45ff22b9f9eb68d748b3cc3f6f4a028dd..a8e07627234f4137f7c3dc018abb13650bd413f2 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -40,7 +40,7 @@ APPLICATION :
         click : 'native'
         cmake : 'native'
         cppunit : 'native'
-        cminpack: 'native'
+        cminpack: '1.3.6'
         cycler : 'native'
         Cython : 'native'
         dateutil : 'native'
@@ -242,10 +242,12 @@ __overwrite__ :
 
    {
      __condition__ : "VARS.dist in ['FD32']"
-      'APPLICATION.products.cminpack': '1.3.6'
+      'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
+      'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
    }
    {
      __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
+      'APPLICATION.products.cminpack': 'native'
       'PRODUCTS.PyFMI.version_2_5.properties.pip' : "no"
       'PRODUCTS.PyFMI.version_2_5.compil_script' : "PyFMI-2.5.sh"
    }

diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh
index 82c7c3652b8bcdc8a92664b36db713060eb9ceae..b66de60a355ca30e0456417645884b29178342d3 100755 (executable)
--- a/products/compil_scripts/openturns-1.17.sh
+++ b/products/compil_scripts/openturns-1.17.sh
@@ -42,13 +42,13 @@ else
     CMAKE_OPTIONS+=" -DCMINPACK_INCLUDE_DIR=${CMINPACK_ROOT_DIR}/include/cminpack-1"
 fi
 # Blas/Lapack
-if [ "${CMINPACK_ROOT_DIR}" != "/usr" ]
+if [ "${LAPACK_ROOT_DIR}" != "/usr" ]
 then
     CMAKE_OPTIONS+=" -DLAPACK_DIR=${LAPACK_ROOT_DIR}/lib/cmake/lapack-3.8.0"
     CMAKE_OPTIONS+=" -DCBLAS_DIR=${LAPACK_ROOT_DIR}/lib/cmake/cblas-3.8.0"
     CMAKE_OPTIONS+=" -DCBLAS_LIBRARIES=$LAPACK_ROOT_DIR/lib/libcblas.so"
 fi
-    ### libxml2 settings
+### libxml2 settings
 if [ -n "$LIBXML2_ROOT_DIR" ]
 then
     # with a native libxml2, do not use these options