From dd5dfe586f0014b1557ea42770b590da8fa3b899 Mon Sep 17 00:00:00 2001 From: Johannes Lenzen Date: Tue, 11 May 2021 10:03:51 +0200 Subject: [PATCH] Changed gtest path --- CI/ci-linux-prepare.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 5b84e281..a8c34f35 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -8,7 +8,8 @@ MAKE_OPTIONS="" BUILDPATH="" # set GTEST path -OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" +# OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0" +OPTIONS="-DGTEST_ROOT=/usr/src/gtest/" if [ "$COMPILER" == "gcc" ]; then echo "Building with GCC"; @@ -66,7 +67,7 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then elif [ "$QTVERSION" == "qt6.0.0" ]; then echo "Using QT6.0.0"; BUILDPATH="$BUILDPATH-qt6.0.0" - OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/6.0.0/gcc_64 -DQT_VERSION=6" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.0/gcc_64 -DQT_VERSION=6" elif [ "$QTVERSION" == "qt6.0.3" ]; then echo "Using QT6.0.3"; BUILDPATH="$BUILDPATH-qt6.0.3"