From 0566f18c8d7a92870847e370b2b8e080b8cc16ee Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 13 Oct 2018 15:39:43 +0300
Subject: update googletest and refactor the script.

---
 CMakeLists.txt    |  2 +-
 download-gtest.sh | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9858a01b..d80e24132 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,7 @@ else()
               PATHS "$ENV{GMOCK_DIR}"
                 "/usr/src/googletest/googlemock"
                     "/usr/src/gmock"
-                "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0"
+                "${CMAKE_SOURCE_DIR}/gtest/gtest/googlemock"
              )
     endif(NOT GMOCK_DIR)
     if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}")
diff --git a/download-gtest.sh b/download-gtest.sh
index 5fc7dfab9..5facffa85 100755
--- a/download-gtest.sh
+++ b/download-gtest.sh
@@ -5,13 +5,18 @@ fi
 (
     cd gtest
     if ! test -e gtest ; then
-        wget -O 'googletest-release-1.7.0.tar.gz' https://github.com/google/googletest/archive/release-1.7.0.tar.gz
-        tar -xvf 'googletest-release-1.7.0.tar.gz'
-        mv googletest-release-1.7.0 gtest
+        gtest_ver=1.8.1
+        wget -O "googletest-release-$gtest_ver.tar.gz" https://github.com/google/googletest/archive/release-$gtest_ver.tar.gz
+        tar -xvf "googletest-release-$gtest_ver.tar.gz"
+        mv googletest-release-$gtest_ver gtest
     fi
-    if ! test -e gmock-1.7.0 ; then
-        wget -O 'googlemock-release-1.7.0.tar.gz' https://github.com/google/googlemock/archive/release-1.7.0.tar.gz
-        tar -xvf 'googlemock-release-1.7.0.tar.gz'
-        mv googlemock-release-1.7.0 gmock-1.7.0
+    if false
+    then
+        mock_ver=1.7.0
+        if ! test -e gmock-$gmock_ver ; then
+            wget -O "googlemock-release-$gmock_ver.tar.gz" https://github.com/google/googlemock/archive/release-$gmock_ver.tar.gz
+            tar -xvf "googlemock-release-$gmock_ver.tar.gz"
+            mv googlemock-release-$gmock_ver gmock-$gmock_ver
+        fi
     fi
 )
-- 
cgit v1.2.3