From 0113d98892ff9a919c86728674806be7f76c2d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=B6ller?= <m_moeller@live.de>
Date: Sat, 9 Jun 2018 13:32:33 +0200
Subject: [PATCH] renamed/added GTEST path variable

---
 CI/Windows.bat | 6 +++---
 CI/ci-linux.sh | 3 +++
 CI/ci-mac.sh   | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CI/Windows.bat b/CI/Windows.bat
index 4460e6fe..278ac033 100644
--- a/CI/Windows.bat
+++ b/CI/Windows.bat
@@ -113,7 +113,7 @@ ECHO "============================================================="
 
 
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%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" -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% ..
 
 %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -133,7 +133,7 @@ mkdir build-debug
 
 cd build-debug
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%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" -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% ..
 
 %VS_PATH% /Build "Debug" OpenMesh.sln /Project "ALL_BUILD"
 
@@ -163,7 +163,7 @@ cd build-release
 
 del *.exe
 
-"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%"  -G "%GENERATOR%" -DBUILD_APPS=%APPS% -DCMAKE_BUILD_TYPE=Release %CMAKE_CONFIGURATION% ..
+"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_ROOT="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%"  -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.sh b/CI/ci-linux.sh
index b3d28017..39fe47a6 100755
--- a/CI/ci-linux.sh
+++ b/CI/ci-linux.sh
@@ -10,6 +10,9 @@ OPTIONS=""
 MAKE_OPTIONS=""
 BUILDPATH=""
 
+# set GTEST path
+OPTIONS = "$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.8.0/"
+
 if [ "$COMPILER" == "gcc" ]; then
   echo "Building with GCC";
   BUILDPATH="gcc"
diff --git a/CI/ci-mac.sh b/CI/ci-mac.sh
index 5b7ecd94..b9b999c6 100755
--- a/CI/ci-mac.sh
+++ b/CI/ci-mac.sh
@@ -11,6 +11,9 @@ export PATH
 
 OPTIONS=""
 
+# set GTEST path
+OPTIONS = "$OPTIONS -DGTEST_ROOT=~/sw/gtest-1.7.0/"
+
 if [ "$LANGUAGE" == "C++98" ]; then
   echo "Building with C++98";
   BUILDPATH="cpp98"