mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-08-08 23:13:54 +00:00
Code Issues Releases Wiki Activity

Building fixes for gnsstk

Browse Source
This commit is contained in:
Carles Fernandez 2022-07-10 20:05:26 +02:00
parent fa821a52a4
commit 1b277347ec
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/data/gnsstk_static13.patch
View File

@ -1,4 +1,6 @@
--- CMakeLists_old.txt 2022-07-10 09:58:33.000000000 +0200 SPDX-License-Identifier: GPL-3.0-or-later
SPDX-FileCopyrightText: 2022 Carles Fernandez-Prades <carles.fernandez@cttc.es>
--- CMakeLists.txt 2022-07-10 09:58:33.000000000 +0200
+++ CMakeLists.txt 2022-07-10 10:02:36.000000000 +0200 +++ CMakeLists.txt 2022-07-10 10:02:36.000000000 +0200
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
# Is dependend on by $GNSSTK/build.sh # Is dependend on by $GNSSTK/build.sh

3
src/utils/rinex-tools/CMakeLists.txt
View File

@ -67,6 +67,9 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
if(GNSSTK_OLDER_THAN_8) if(GNSSTK_OLDER_THAN_8)
target_compile_definitions(obsdiff PRIVATE -DOLD_GPSTK=1) target_compile_definitions(obsdiff PRIVATE -DOLD_GPSTK=1)
endif() endif()
if(GNSSTK_OLDER_THAN_9)
target_compile_definitions(obsdiff PRIVATE -DGNSSTK_OLDER_THAN_9=1)
endif()
if(GNSSTK_OLDER_THAN_13) if(GNSSTK_OLDER_THAN_13)
target_compile_definitions(obsdiff PRIVATE -DGNSSTK_OLDER_THAN_13=1) target_compile_definitions(obsdiff PRIVATE -DGNSSTK_OLDER_THAN_13=1)
endif() endif()

2
src/utils/rinex2assist/main.cc
View File

@ -32,14 +32,12 @@
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#if GNSSTK_USES_GPSTK_NAMESPACE #if GNSSTK_USES_GPSTK_NAMESPACE
#include <gpstk/GALWeekSecond.hpp>
#include <gpstk/GPSWeekSecond.hpp> #include <gpstk/GPSWeekSecond.hpp>
#include <gpstk/Rinex3NavData.hpp> #include <gpstk/Rinex3NavData.hpp>
#include <gpstk/Rinex3NavHeader.hpp> #include <gpstk/Rinex3NavHeader.hpp>
#include <gpstk/Rinex3NavStream.hpp> #include <gpstk/Rinex3NavStream.hpp>
namespace gnsstk = gpstk; namespace gnsstk = gpstk;
#else #else
#include <gnsstk/GALWeekSecond.hpp>
#include <gnsstk/GPSWeekSecond.hpp> #include <gnsstk/GPSWeekSecond.hpp>
#include <gnsstk/Rinex3NavData.hpp> #include <gnsstk/Rinex3NavData.hpp>
#include <gnsstk/Rinex3NavHeader.hpp> #include <gnsstk/Rinex3NavHeader.hpp>