From 01d6ca960daacccf7850786e15e60d57478f8688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 29 Nov 2023 10:39:41 +0100
Subject: [PATCH] Disable GTEST_ROOT setting on all CI builds

---
 CI/Windows.bat         | 10 +++-------
 CI/ci-linux-prepare.sh |  8 --------
 CI/ci-mac-prepare.sh   |  3 ---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/CI/Windows.bat b/CI/Windows.bat
index e482eeaf..62105f46 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -19,7 +19,6 @@ IF "%SHARED%" == "TRUE" (
 
 IF "%BUILD_PLATFORM%" == "VS2015" (
     set LIBPATH=E:\libs\VS2015
-    set GTESTVERSION=gtest-1.7.0
     set GENERATOR=Visual Studio 14%ARCH_VS%
     set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
 
@@ -37,7 +36,6 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
 
 IF "%BUILD_PLATFORM%" == "VS2017" (
     set LIBPATH=E:\libs\VS2017
-    set GTESTVERSION=gtest-1.7.0
     set GENERATOR=Visual Studio 15%ARCH_VS%
     set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com"
 
@@ -51,7 +49,6 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
 
 IF "%BUILD_PLATFORM%" == "VS2019" (
     set LIBPATH=E:\libs\VS2019
-    set GTESTVERSION=gtest-1.11.0
     set GENERATOR=Visual Studio 16 2019
     set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
 
@@ -91,7 +88,6 @@ ECHO "Building with :"
 whoami
 ECHO "ARCHITECTURE        : %ARCHITECTURE%"
 ECHO "BUILD_PLATFORM      : %BUILD_PLATFORM%"
-ECHO "GTESTVERSION        : %GTESTVERSION%"
 ECHO "GENERATOR           : %GENERATOR%"
 ECHO "VS_PATH             : %VS_PATH%"
 ECHO "LIBPATH             : %LIBPATH%"
@@ -120,7 +116,7 @@ IF EXIST %QT_INSTALL_PATH%\ (
 )
 
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -G "%GENERATOR%"  -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -142,7 +138,7 @@ mkdir build-debug
 
 cd build-debug
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -G "%GENERATOR%" -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_BUILD_TYPE=Debug -DOPENMESH_BUILD_SHARED=%SHARED% -DBUILD_APPS=%APPS% %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Debug" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -174,7 +170,7 @@ cd build-release
 
 del *.exe
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%"  -G "%GENERATOR%" -DBUILD_APPS=%APPS% -DCMAKE_BUILD_TYPE=Release %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -G "%GENERATOR%" -DBUILD_APPS=%APPS% -DCMAKE_BUILD_TYPE=Release %CMAKE_CONFIGURATION% ..
 
 %VS_PATH% /Build "Release" OpenMesh.sln /Project "PACKAGE"
 
diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh
index b3120761..d628d1ea 100755
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -7,14 +7,6 @@ OPTIONS=""
 MAKE_OPTIONS=""
 BUILDPATH=""
 
-# set GTEST path
-if [ -d "$HOME/sw/gtest-1.10.0" ]; then
-  OPTIONS="-DGTEST_ROOT=$HOME/sw/gtest-1.10.0"
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/sw/gtest-1.10.0/lib"
-else
-  OPTIONS="-DGTEST_ROOT=/usr/src/gtest/"
-fi
-
 if [ "$COMPILER" == "gcc" ]; then
   echo "Building with GCC";
   BUILDPATH="gcc"
diff --git a/CI/ci-mac-prepare.sh b/CI/ci-mac-prepare.sh
index 39cf1f35..10d11959 100755
--- a/CI/ci-mac-prepare.sh
+++ b/CI/ci-mac-prepare.sh
@@ -11,9 +11,6 @@ export PATH
 
 OPTIONS=""
 
-# set GTEST path
-OPTIONS="$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
-
 if [ "$LANGUAGE" == "cpp98" ]; then
   echo "Building with C++98";
   BUILDPATH="cpp98"