mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-06-29 08:23:19 +00:00
Update Googletest to v1.12.0
This commit is contained in:
parent
525a8ba602
commit
b540f596c0
|
@ -323,10 +323,11 @@ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
|
||||||
set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
|
set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
|
||||||
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "11.1.x")
|
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
|
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")
|
set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x")
|
||||||
else()
|
else()
|
||||||
set(GNSSSDR_GTEST_LOCAL_VERSION "1.11.0")
|
set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.0")
|
||||||
endif()
|
endif()
|
||||||
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
||||||
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
|
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
|
||||||
|
|
14
README.md
14
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:
|
#### 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
|
$ wget https://github.com/google/glog/archive/v0.6.0.tar.gz
|
||||||
$ tar xvfz v0.5.0.tar.gz
|
$ tar xvfz v0.6.0.tar.gz
|
||||||
$ cd glog-0.5.0
|
$ cd glog-0.6.0
|
||||||
$ mkdir build && cd build
|
$ mkdir build && cd build
|
||||||
$ cmake ..
|
$ cmake ..
|
||||||
$ make
|
$ 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:
|
#### 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
|
$ wget https://github.com/google/googletest/archive/release-1.12.0.zip
|
||||||
$ unzip release-1.11.0.zip
|
$ unzip release-1.12.0.zip
|
||||||
```
|
```
|
||||||
|
|
||||||
Please **DO NOT build or install** Google Test. Every user needs to compile
|
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:
|
`$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
|
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
|
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
|
package, then it will download a fresh copy of the Google Test source code and
|
||||||
|
|
Loading…
Reference in New Issue
Block a user