From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Tue, 30 Aug 2022 11:46:28 +0000 (+0200)
Subject: cminpack compilation script
X-Git-Tag: V9_11_0~339
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ddb52d16af4c65022928cd3c3fd9b5f853247452;p=tools%2Fsat_salome.git

cminpack compilation script
---

diff --git a/products/compil_scripts/cminpack-1.3.6.sh b/products/compil_scripts/cminpack-1.3.6.sh
index 0f5ef67..a8f8a3c 100755
--- a/products/compil_scripts/cminpack-1.3.6.sh
+++ b/products/compil_scripts/cminpack-1.3.6.sh
@@ -18,16 +18,16 @@ CMAKE_OPTIONS+=" -DUSE_BLAS=ON"
 CMAKE_OPTIONS+=" -DUSE_FPIC=ON"
 CMAKE_OPTIONS+=" -DBUILD_EXAMPLES=OFF"
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
-# strangely on CentOS 8 - CMake fails to find CBLAS include directory
-if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && -d /usr/include/cblas ]]; then
-    CMAKE_OPTIONS+=" -DCBLAS_INCLUDE_DIRS=/usr/include/cblas "
+
 # Blas/Lapack
-elif [ -n "$LAPACK_ROOT_DIR" ] && [ "${SAT_lapack_IS_NATIVE}" != "1" ]; then
+if [ -n "$LAPACK_ROOT_DIR" ] && [ "${SAT_lapack_IS_NATIVE}" != "1" ]; 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"
     CMAKE_OPTIONS+=" -DBLAS_LIBRARIES=$LAPACK_ROOT_DIR/lib/libblas.so"
     CMAKE_OPTIONS+=" -DCBLAS_INCLUDE_DIRS=${LAPACK_ROOT_DIR}/include "
+elif [ -d /usr/include/cblas ]; then
+    CMAKE_OPTIONS+=" -DCBLAS_INCLUDE_DIRS=/usr/include/cblas "
 fi
 
 echo