mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Update Googletest to v1.12.0

This commit is contained in:
Carles Fernandez 2022-06-28 13:03:40 +02:00
parent 525a8ba602
commit b540f596c0
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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")

14
README.md
View File

@ -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