]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
PERSALYS: fix compilation issue on Ubuntu 20.04
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 11 Apr 2023 11:11:57 +0000 (13:11 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Tue, 11 Apr 2023 11:11:57 +0000 (13:11 +0200)
products/compil_scripts/PERSALYS-v14.0.1.sh

index d94b74f7dd397693ad3d84b8736ca4b1905a99d0..2a518aabb4e8860bddec641a1f5331bae585c9af 100755 (executable)
@@ -23,10 +23,15 @@ CMAKE_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"
 
-# strangely Centos 8 fails to guess qwt installation
+# strangely some distributions fail to guess qwt installation location
+#  - CentOS 8
+#  - Ubuntu 20.04
 if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && "$SAT_qwt_IS_NATIVE" == "1" ]]; then
     CMAKE_OPTIONS+=" -DQWT_LIBRARY=/usr/lib64/libqwt-qt5.so"
     CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=/usr/include/qt5/qwt"
+elif [[ $DIST_NAME == "UB" && $DIST_VERSION == "20.04" && "$SAT_qwt_IS_NATIVE" == "1" ]]; then
+    CMAKE_OPTIONS+=" -DQWT_LIBRARY=/usr/lib/libqwt-qt5.so"
+    CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=/usr/include/qwt"
 elif [ "$SAT_qwt_IS_NATIVE" != "1" ]; then
     CMAKE_OPTIONS+=" -DQWT_LIBRARY=$QWT_ROOT_DIR/lib/libqwt.so"
     CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include"