Bump local version of GNSSTk to v15.0.0

Silence warnings related to gnsstk

CMakeLists.txt

@@ -363,7 +363,7 @@ set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "31.1")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.15")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.17.0")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "origin/master")
-set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.3.0")
+set(GNSSSDR_GNSSTK_LOCAL_VERSION "15.0.0")
 set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.9.4")
 set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
 set(GNSSSDR_ABSL_LOCAL_VERSION "origin/master") # live at head (see https://abseil.io/about/releases)

tests/CMakeLists.txt

@@ -366,8 +366,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
         if(CMAKE_VERSION VERSION_GREATER 3.17.0)
             set(GNSSTK_PATCH_COMMAND
                 cd ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION} &&
-                ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static14.patch &&
+                ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_static15.patch
-                ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/core/lib/GNSSCore/ObsID.hpp < ${GNSSSDR_SOURCE_DIR}/tests/data/gnsstk_gcc13.patch
             )
         else()
             set(GNSSTK_PATCH_COMMAND
@@ -407,9 +406,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
                     set(GNSSTK_PARALLEL_BUILD "-j${NUMBER_OF_PROCESSORS}")
                 endif()
             endif()
-            if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            set(GNSSTK_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-w")
-                set(GNSSTK_FLAGS "-DCMAKE_CXX_FLAGS:STRING=-w")  # Fix for clang in aarch64
-            endif()
             if(CMAKE_VERSION VERSION_GREATER 3.17.0)
                 set(GNSSTK_CXX_STANDARD 17)
                 if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND ("${DARWIN_VERSION}" VERSION_GREATER_EQUAL "14"))

tests/data/gnsstk_static15.patch

@@ -2,6 +2,15 @@ SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-FileCopyrightText: 2022 Carles Fernandez-Prades <carles.fernandez@cttc.es>
 --- CMakeLists.txt	2022-12-19 11:40:38.000000000 +0100
 +++ CMakeLists.txt	2022-12-19 11:56:49.000000000 +0100
+@@ -6,7 +6,7 @@
+ #           Is dependend on by $GNSSTK/build.sh
+ #============================================================
+ 
+-cmake_minimum_required( VERSION 3.7.2 )
++cmake_minimum_required( VERSION 3.7.2...3.10 )
+ 
+ project( GNSSTK )
+ set( GNSSTK_VERSION_MAJOR "15" )
 @@ -21,6 +21,16 @@
  
  # This sets up variables contining GNU standard installation locations.

utils/rinex-tools/CMakeLists.txt

@@ -37,19 +37,8 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
     if(GNSSTK_VERSION AND "${GNSSTK_VERSION}" VERSION_LESS 3.0.1)
         set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14)  # Required by GPSTk v3.0.0
     endif()
-    # Do not show warnings raised by GPSTk v3.0.0
+    # Do not show warnings raised by GPSTk / GNSSTk
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(obsdiff PRIVATE -w)
-        target_compile_options(obsdiff
-            PRIVATE
-                -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder -Wno-deprecated-copy -Wno-extra -Wno-unused-but-set-variable -Wno-unknown-pragmas
-        )
-    endif()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        target_compile_options(obsdiff
-            PRIVATE
-                -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder
-        )
-    endif()
 
     if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
         add_dependencies(obsdiff armadillo-${armadillo_RELEASE})

utils/rinex2assist/CMakeLists.txt

@@ -73,19 +73,8 @@ if(TARGET Boost::iostreams AND TARGET Boost::serialization)
         set_property(TARGET rinex2assist PROPERTY CXX_STANDARD 14)  # Required by GPSTk v3.0.0
     endif()
 
-    # Do not show warnings raised by GPSTk v3.0.0
+    # Do not show warnings raised by GPSTk / GNSSTk
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(rinex2assist PRIVATE -w)
-        target_compile_options(rinex2assist
-            PRIVATE
-                -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-variable -Wno-deprecated-copy -Wno-extra
-        )
-    endif()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        target_compile_options(rinex2assist
-            PRIVATE
-                -Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-inconsistent-missing-override
-        )
-    endif()
 
     target_link_libraries(rinex2assist
         PRIVATE

utils/rinex2assist/main.cc

@@ -31,12 +31,14 @@
 #include <cstdlib>
 #include <iostream>
 #if GNSSTK_USES_GPSTK_NAMESPACE
+#include <gpstk/Epoch.hpp>
 #include <gpstk/GPSWeekSecond.hpp>
 #include <gpstk/Rinex3NavData.hpp>
 #include <gpstk/Rinex3NavHeader.hpp>
 #include <gpstk/Rinex3NavStream.hpp>
 namespace gnsstk = gpstk;
 #else
+#include <gnsstk/Epoch.hpp>
 #include <gnsstk/GPSWeekSecond.hpp>
 #include <gnsstk/Rinex3NavData.hpp>
 #include <gnsstk/Rinex3NavHeader.hpp>
@@ -206,7 +208,7 @@ int main(int argc, char** argv)
                     gps_utc_model.tot = hdr.mapTimeCorr["GPUT"].refSOW;
                     gps_utc_model.WN_T = hdr.mapTimeCorr["GPUT"].refWeek;
 #else
-                    if (hdr.mapTimeCorr["GPUT"].refTime != gnsstk::CommonTime::BEGINNING_OF_TIME)
+                    if (hdr.mapTimeCorr["GPUT"].refTime != gnsstk::Epoch(gnsstk::CommonTime::BEGINNING_OF_TIME))
                         {
                             gnsstk::GPSWeekSecond gws(hdr.mapTimeCorr["GPUT"].refTime);
                             gps_utc_model.tot = gws.getSOW();
@@ -238,7 +240,7 @@ int main(int argc, char** argv)
                     gal_utc_model.tot = hdr.mapTimeCorr["GAUT"].refSOW;
                     gal_utc_model.WNot = hdr.mapTimeCorr["GAUT"].refWeek;
 #else
-                    if (hdr.mapTimeCorr["GAUT"].refTime != gnsstk::CommonTime::BEGINNING_OF_TIME)
+                    if (hdr.mapTimeCorr["GAUT"].refTime != gnsstk::Epoch(gnsstk::CommonTime::BEGINNING_OF_TIME))
                         {
                             gnsstk::GPSWeekSecond gws(hdr.mapTimeCorr["GAUT"].refTime);
                             gal_utc_model.tot = gws.getSOW();