From 7f14fd265044aff4143f749d974d597b217565e4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sat, 25 Dec 2021 22:27:26 +0100
Subject: [PATCH] Update local glog version to v0.6.0

---
 CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dd1b53eb..bfcb50d1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,7 +325,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
 # Versions to download and build (but not installed) if not found
 ################################################################################
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
-set(GNSSSDR_GLOG_LOCAL_VERSION "0.5.0")
+set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
 set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.7.x")
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR
   (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
@@ -341,6 +341,10 @@ set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.19.0")
 set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.6.0")
 set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
 
+if(CMAKE_VERSION VERSION_LESS "3.16")
+    set(GNSSSDR_GLOG_LOCAL_VERSION "0.5.0")
+endif()
+
 if(CMAKE_VERSION VERSION_LESS "3.3")
     set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")    # Fix for Debian 8
 endif()
@@ -1679,9 +1683,12 @@ ${CMAKE_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure
                 ${CMAKE_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/${CMAKE_FIND_LIBRARY_PREFIXES}glogd${CMAKE_STATIC_LIBRARY_SUFFIX}
             )
         endif()
-        if((CMAKE_VERSION VERSION_GREATER 3.12.0) AND NOT (CMAKE_GENERATOR STREQUAL Xcode))
+        if((CMAKE_VERSION VERSION_GREATER 3.12.0) AND NOT (CMAKE_GENERATOR STREQUAL Xcode) AND NOT CMAKE_CROSSCOMPILING)
             set(PARALLEL_BUILD "--parallel 2")
         endif()
+        if(GNSSSDR_GLOG_LOCAL_VERSION VERSION_GREATER 0.5.0)
+            set(GLOG_GTEST -DWITH_GTEST=FALSE)
+        endif()
         ExternalProject_Add(glog-${GNSSSDR_GLOG_LOCAL_VERSION}
             DEPENDS ${TARGET_GFLAGS}
             PREFIX ${CMAKE_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}
@@ -1694,6 +1701,7 @@ ${CMAKE_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configure
                 ${GLOG_TOOLCHAIN_FILE}
                 -DCMAKE_BUILD_TYPE=$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:Debug>$<$<CONFIG:Coverage>:Debug>$<$<CONFIG:O2WithASM>:RelWithDebInfo>$<$<CONFIG:O3WithASM>:RelWithDebInfo>$<$<CONFIG:ASAN>:Debug>
                 -DBUILD_SHARED_LIBS=OFF
+                ${GLOG_GTEST}
                 -DBUILD_TESTING=OFF
             BUILD_COMMAND "${GLOG_MAKE_PROGRAM} ${PARALLEL_BUILD}"
             BUILD_BYPRODUCTS ${GLOG_BUILD_BYPRODUCTS}