From b540f596c09aa9abda099e88e73b7f3c23680d98 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 28 Jun 2022 13:03:40 +0200 Subject: [PATCH] Update Googletest to v1.12.0 --- CMakeLists.txt | 5 +++-- README.md | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a813ad30..81bf4fc1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,10 +323,11 @@ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0") set(GNSSSDR_ARMADILLO_LOCAL_VERSION "11.1.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)) + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR + CMAKE_VERSION VERSION_LESS 3.5) set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x") else() - set(GNSSSDR_GTEST_LOCAL_VERSION "1.11.0") + set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.0") endif() set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") diff --git a/README.md b/README.md index d2c5c2ddf..23175ee5e 100644 --- a/README.md +++ b/README.md @@ -415,9 +415,9 @@ $ sudo ldconfig #### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging: ``` -$ wget https://github.com/google/glog/archive/v0.5.0.tar.gz -$ tar xvfz v0.5.0.tar.gz -$ cd glog-0.5.0 +$ wget https://github.com/google/glog/archive/v0.6.0.tar.gz +$ tar xvfz v0.6.0.tar.gz +$ cd glog-0.6.0 $ mkdir build && cd build $ cmake .. $ make @@ -428,8 +428,8 @@ $ sudo ldconfig #### Download the [Google C++ Testing Framework](https://github.com/google/googletest "Googletest Homepage"), also known as Google Test: ``` -$ wget https://github.com/google/googletest/archive/release-1.11.0.zip -$ unzip release-1.11.0.zip +$ wget https://github.com/google/googletest/archive/release-1.12.0.zip +$ unzip release-1.12.0.zip ``` Please **DO NOT build or install** Google Test. Every user needs to compile @@ -453,10 +453,10 @@ downloaded resides. Just type in your terminal (or add it to your `$HOME/.bashrc` file for a permanent solution) the following line: ``` -export GTEST_DIR=/home/username/googletest-release-1.11.0 +export GTEST_DIR=/home/username/googletest-release-1.12.0 ``` -changing `/home/username/googletest-release-1.11.0` by the actual path where you +changing `/home/username/googletest-release-1.12.0` by the actual path where you unpacked Google Test. If the CMake script does not find that folder, or the environment variable is not defined, or the source code is not installed by a package, then it will download a fresh copy of the Google Test source code and