From 11f7bf58834d1337483ef43bb681edce4d0bd29c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 11 Jan 2023 16:22:45 +0100 Subject: [PATCH] Update GNSSTk library version to v14.0.0 --- CMakeLists.txt | 2 +- docs/CHANGELOG.md | 5 +++++ src/tests/CMakeLists.txt | 2 +- .../data/{gnsstk_static138.patch => gnsstk_static14.patch} | 0 4 files changed, 7 insertions(+), 2 deletions(-) rename src/tests/data/{gnsstk_static138.patch => gnsstk_static14.patch} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index df7a50869..33d27e6dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,7 +348,7 @@ else() endif() set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") if(CMAKE_VERSION VERSION_GREATER 3.17.0) - set(GNSSSDR_GNSSTK_LOCAL_VERSION "13.8.0") + set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.0.0") else() set(GNSSSDR_GNSSTK_LOCAL_VERSION "13.7.0") endif() diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 68fb23052..b60c87ddc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -70,6 +70,11 @@ All notable changes to GNSS-SDR will be documented in this file. - Improved passing of compiler flags to `volk_gnsssdr` if the corresponding environment variables are defined. This fixes warnings in some packaging systems. +- Test files are now donwloaded at configuration time instead of being included + in the source tree. This allows for a smaller package and fixes Lintian + `very-long-line-length-in-source-file` warnings since those files were not + recognized as binaries. The configuration flag `-DENABLE_PACKAGING=ON` passed + to CMake deactivates file downloading. ### Improvements in Usability: diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 5bca74111..6a71d38d0 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -369,7 +369,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}/src/tests/data/gnsstk_static138.patch + ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/gnsstk-${GNSSSDR_GNSSTK_LOCAL_VERSION}/CMakeLists.txt < ${GNSSSDR_SOURCE_DIR}/src/tests/data/gnsstk_static14.patch ) else() set(GNSSTK_PATCH_COMMAND diff --git a/src/tests/data/gnsstk_static138.patch b/src/tests/data/gnsstk_static14.patch similarity index 100% rename from src/tests/data/gnsstk_static138.patch rename to src/tests/data/gnsstk_static14.patch