From 49fc117ab19084e39e1d7a09220faf4dce15250d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 24 Apr 2021 01:16:20 +0200
Subject: [PATCH] Improve control on gtest version

---
 .github/workflows/main.yml | 2 +-
 CMakeLists.txt             | 3 ++-
 src/tests/CMakeLists.txt   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf35260a0..4f9421296 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,7 +56,7 @@ jobs:
     - name: install dependencies
       run: brew update && brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio log4cpp pugixml protobuf && ln -s /usr/local/opt/llvm/bin/clang-tidy /usr/local/bin && ln -s /usr/local/Cellar/llvm/11.*/bin/clang-apply-replacements /usr/local/bin && cp /usr/local/Cellar/llvm/11.*/share/clang/run-clang-tidy.py /usr/local/bin && pip3 install mako
     - name: Prepare run
-      run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.10.0 core_monitor pvt_libs
+      run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.10.x core_monitor pvt_libs
     - name: run clang-tidy
       run: cd build && run-clang-tidy.py -fix
     - name: check
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 816716644..bfa207535 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,7 +325,8 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
 set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
 set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.4.x")
-set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0")
+set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x")
+set(GNSSSDR_GTEST_LOCAL_VERSION_POST_CMAKE_3_19 "23ef29555ef4789f555f1ba8c51b4c52975f0907")  # Used with CMake >= 3.19
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.21")
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8b9c181de..3d2deb755 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -63,11 +63,11 @@ if(NOT GOOGLETEST_FOUND)
                 ${CMAKE_BINARY_DIR}/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_maind${CMAKE_STATIC_LIBRARY_SUFFIX}
             )
         endif()
-        set(GOOGLETEST_GIT_TAG "v1.10.x")
+        set(GOOGLETEST_GIT_TAG "v${GNSSSDR_GTEST_LOCAL_VERSION}")
         if(CMAKE_VERSION VERSION_GREATER 3.18.99)
             # workaround to avoid warning about deprecated CMakeLists.txt with CMake >= 3.19
             # Remove after a stable release of Googletest including this fix
-            set(GOOGLETEST_GIT_TAG "d128fc8252d53baad6ea456fa08cbf9028d255f4")
+            set(GOOGLETEST_GIT_TAG ${GNSSSDR_GTEST_LOCAL_VERSION_POST_CMAKE_3_19})
         endif()
         ExternalProject_Add(gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
             GIT_REPOSITORY https://github.com/google/googletest