1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-28 05:57:39 +00:00

Simplify cmake scripts, fix volk_gnsssdr cross-compilation, update ProtocolBuffers to 3.11.2

This commit is contained in:
Carles Fernandez
2020-01-13 01:49:00 +01:00
parent 24a2d6c5d9
commit bc9725c745
11 changed files with 219 additions and 180 deletions

View File

@@ -1,4 +1,4 @@
# Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
# Copyright (C) 2012-2020 (see AUTHORS file for a list of contributors)
#
# This file is part of GNSS-SDR.
#
@@ -118,7 +118,7 @@ if(Boost_VERSION_STRING VERSION_GREATER 1.65.99)
endif()
# Fix for Boost Asio < 1.70
if(OS_IS_MACOSX)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (Boost_VERSION_STRING VERSION_LESS 1.70.0))
if(${has_string_view})
target_compile_definitions(tracking_libs