From: Nabil Ghodbane Date: Fri, 4 Mar 2022 11:22:10 +0000 (+0100) Subject: PERSALYS on CentOS 8 help cmake to find qwt X-Git-Tag: V9_9_0~151 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cda585a571cc0b030188fcd80269d5e24e5bd97f;p=tools%2Fsat_salome.git PERSALYS on CentOS 8 help cmake to find qwt --- diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh index 85eca3f..bcad863 100755 --- a/products/compil_scripts/PERSALYS-v11.0.sh +++ b/products/compil_scripts/PERSALYS-v11.0.sh @@ -22,10 +22,16 @@ CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=$KERNEL_ROOT_DIR" CMAKR_OPTIONS+=" -DSalomeKERNEL_DIR=$KERNEL_ROOT_DIR/salome_adm/cmake_files" CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" CMAKE_OPTIONS+=" -DPy2cpp_DIR=$PY2CPP_ROOT_DIR//lib/cmake/py2cpp" -if [ "$QWT_ROOT_DIR" != "/usr" ]; then + +# strangely Centos 8 fails to guess qwt installation +if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native ]]; then + CMAKE_OPTIONS+=" -DQWT_LIBRARY=/usr/lib64/libqwt-qt5.so" + CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt" +elif [ "$QWT_ROOT_DIR" != "/usr" ]; then CMAKE_OPTIONS+=" -DQWT_LIBRARY=$QWT_ROOT_DIR/lib/libqwt.so" CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include" fi + CMAKE_OPTIONS+=" -DSPHINX_ROOT_DIR=$SPHINX_ROOT_DIR" CMAKE_OPTIONS+=" -DYACS_ROOT_DIR=$YACS_ROOT_DIR" CMAKR_OPTIONS+=" -DSalomeYACS_DIR=$YACS_ROOT_DIR/salome_adm/cmake_files"