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

Changed gtest path

Browse Source
This commit is contained in:
Johannes Lenzen
2021-05-11 10:03:51 +02:00
parent 72a5f4f072
commit dd5dfe586f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,8 @@ MAKE_OPTIONS=""
BUILDPATH="" BUILDPATH=""
# set GTEST path # 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 if [ "$COMPILER" == "gcc" ]; then
echo "Building with GCC"; echo "Building with GCC";
@@ -66,7 +67,7 @@ elif [ "$QTVERSION" == "qt5.15.1" ]; then
elif [ "$QTVERSION" == "qt6.0.0" ]; then elif [ "$QTVERSION" == "qt6.0.0" ]; then
echo "Using QT6.0.0"; echo "Using QT6.0.0";
BUILDPATH="$BUILDPATH-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 elif [ "$QTVERSION" == "qt6.0.3" ]; then
echo "Using QT6.0.3"; echo "Using QT6.0.3";
BUILDPATH="$BUILDPATH-qt6.0.3" BUILDPATH="$BUILDPATH-qt6.0.3"