mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-03-04 10:38:17 +00:00
Code Issues Releases Wiki Activity

Bump Googletest to 1.16.0

Browse Source
This commit is contained in:
Carles Fernandez 2025-02-08 09:07:04 +01:00
parent 8e4dcd08be
commit 00e5b2b4ec
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -1,7 +1,7 @@
# GNSS-SDR is a Global Navigation Satellite System software-defined receiver. # GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
# SPDX-FileCopyrightText: 2010-2024 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-FileCopyrightText: 2010-2025 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
################################################################################ ################################################################################
@ -362,7 +362,7 @@ set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.1")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.28") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.28")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "29.3") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "29.3")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.15") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.15")
set(GNSSSDR_GTEST_LOCAL_VERSION "1.15.2") set(GNSSSDR_GTEST_LOCAL_VERSION "1.16.0")
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "origin/master") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "origin/master")
set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.3.0") set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.3.0")
set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.9.1") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.9.1")
@ -404,6 +404,9 @@ if(CMAKE_CROSSCOMPILING OR CMAKE_VERSION VERSION_LESS "3.13" OR
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12")
endif() endif()
if(CMAKE_VERSION VERSION_LESS "3.16")
set(GNSSSDR_GTEST_LOCAL_VERSION "1.15.2")
endif()
if(CMAKE_VERSION VERSION_LESS "3.13" OR if(CMAKE_VERSION VERSION_LESS "3.13" OR
(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3.1) OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3.1) OR
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)) (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0))
@ -756,9 +759,7 @@ if(NOT BOOST_ROOT)
# Workaround for Macports # Workaround for Macports
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${DETECT_MACPORTS} EQUAL 0) if(${DETECT_MACPORTS} EQUAL 0)
if(EXISTS "${MACPORTS_PREFIX}/libexec/boost/1.81") if(EXISTS "${MACPORTS_PREFIX}/libexec/boost/1.76")
set(BOOST_ROOT "${MACPORTS_PREFIX}/libexec/boost/1.81")
elseif(EXISTS "${MACPORTS_PREFIX}/libexec/boost/1.76")
set(BOOST_ROOT "${MACPORTS_PREFIX}/libexec/boost/1.76") set(BOOST_ROOT "${MACPORTS_PREFIX}/libexec/boost/1.76")
elseif(EXISTS "${MACPORTS_PREFIX}/libexec/boost/1.71") elseif(EXISTS "${MACPORTS_PREFIX}/libexec/boost/1.71")
set(BOOST_ROOT "${MACPORTS_PREFIX}/libexec/boost/1.71") set(BOOST_ROOT "${MACPORTS_PREFIX}/libexec/boost/1.71")