Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of qwt as its not used anywhere in OpenMesh

Browse Source
This commit is contained in:
Jan Möbius
2021-02-10 10:42:57 +01:00
parent 29d25b1072
commit 0db4709f80
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CI/ci-linux-prepare.sh
View File

@@ -42,27 +42,27 @@ fi
if [ "$QTVERSION" == "qt5.13.0" ]; then if [ "$QTVERSION" == "qt5.13.0" ]; then
echo "Using QT5.13.0"; echo "Using QT5.13.0";
BUILDPATH="$BUILDPATH-qt5.13.0" BUILDPATH="$BUILDPATH-qt5.13.0"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64"
elif [ "$QTVERSION" == "qt5.12.2" ]; then elif [ "$QTVERSION" == "qt5.12.2" ]; then
echo "Using QT5.12.2"; echo "Using QT5.12.2";
BUILDPATH="$BUILDPATH-qt5.12.2" BUILDPATH="$BUILDPATH-qt5.12.2"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.12.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.12.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.12.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64"
elif [ "$QTVERSION" == "qt5.11.2" ]; then elif [ "$QTVERSION" == "qt5.11.2" ]; then
echo "Using QT5.11.2"; echo "Using QT5.11.2";
BUILDPATH="$BUILDPATH-qt5.11.2" BUILDPATH="$BUILDPATH-qt5.11.2"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.11.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.11.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.11.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
elif [ "$QTVERSION" == "qt5.9.0" ]; then elif [ "$QTVERSION" == "qt5.9.0" ]; then
echo "Using QT5.9.0"; echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0" BUILDPATH="$BUILDPATH-qt5.9.0"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
elif [ "$QTVERSION" == "qt5.13.2" ]; then elif [ "$QTVERSION" == "qt5.13.2" ]; then
echo "Using QT5.13.2"; echo "Using QT5.13.2";
BUILDPATH="$BUILDPATH-qt5.13.2" BUILDPATH="$BUILDPATH-qt5.13.2"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.4-qt5.13.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.4-qt5.13.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.4-qt5.13.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64"
elif [ "$QTVERSION" == "qt5.15.1" ]; then elif [ "$QTVERSION" == "qt5.15.1" ]; then
echo "Using QT5.15.1"; echo "Using QT5.15.1";
BUILDPATH="$BUILDPATH-qt5.15.1" BUILDPATH="$BUILDPATH-qt5.15.1"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.5-qt5.15.1/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.5-qt5.15.1/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.5-qt5.15.1/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64" OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64"
fi fi
#===================================== #=====================================