Merge branch 'master' into qt6

2021-05-03 13:43:34 +02:00
parent 42a6e445cc e710d4cb6f
commit e26d263867
3 changed files with 3 additions and 5 deletions
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -8,7 +8,7 @@ MAKE_OPTIONS=""
 BUILDPATH=""

 # set GTEST path
-OPTIONS="-DGTEST_ROOT=/usr/src/gtest/"
+OPTIONS="-DGTEST_ROOT=~/sw/gtest-1.10.0"

 if [ "$COMPILER" == "gcc" ]; then
  echo "Building with GCC";