From: Nabil Ghodbane Date: Sat, 6 Nov 2021 09:29:20 +0000 (+0100) Subject: cminpack: do not use system cblas if lapack+cblas embedded X-Git-Tag: V9_8_0~52 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ea25f95fdad0e11b54b2ff268870bba50df588e9;p=tools%2Fsat_salome.git cminpack: do not use system cblas if lapack+cblas embedded --- diff --git a/products/compil_scripts/cminpack-1.3.6.sh b/products/compil_scripts/cminpack-1.3.6.sh index e64e8a0..4784e5a 100755 --- a/products/compil_scripts/cminpack-1.3.6.sh +++ b/products/compil_scripts/cminpack-1.3.6.sh @@ -22,6 +22,13 @@ 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" && $APPLICATION_NAME =~ native && -d /usr/include/cblas ]]; then CMAKE_OPTIONS+=" -DCBLAS_INCLUDE_DIRS=/usr/include/cblas " +# Blas/Lapack +elif [ -n "$LAPACK_ROOT_DIR" ] && [ "${LAPACK_ROOT_DIR}" != "/" ]; 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 " fi echo