From 58c066bd9eae311ae6d0ac9f8e1878b665e7caea Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 21 Feb 2024 17:39:43 +0100 Subject: [PATCH 01/13] Find dependencies in the loongarch64 architecture --- CMakeLists.txt | 1 + cmake/Modules/FindCPUFEATURES.cmake | 1 + cmake/Modules/FindGFLAGS.cmake | 1 + cmake/Modules/FindGFORTRAN.cmake | 1 + cmake/Modules/FindGLOG.cmake | 1 + cmake/Modules/FindGNURADIO.cmake | 1 + cmake/Modules/FindGRIIO.cmake | 1 + cmake/Modules/FindGRLIMESDR.cmake | 1 + cmake/Modules/FindGROSMOSDR.cmake | 1 + cmake/Modules/FindLIBAD9361.cmake | 1 + cmake/Modules/FindLIBIIO.cmake | 1 + docs/CHANGELOG.md | 12 +++++++++++- 12 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ad58d673..245d429eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2160,6 +2160,7 @@ find_library(GNUTLS_OPENSSL_LIBRARY /usr/lib/sparc64-linux-gnu /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindCPUFEATURES.cmake b/cmake/Modules/FindCPUFEATURES.cmake index 6f25e91d2..7c25e69c2 100644 --- a/cmake/Modules/FindCPUFEATURES.cmake +++ b/cmake/Modules/FindCPUFEATURES.cmake @@ -34,6 +34,7 @@ find_library(CPUFEATURES_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGFLAGS.cmake b/cmake/Modules/FindGFLAGS.cmake index 2649380c9..08a5056b8 100644 --- a/cmake/Modules/FindGFLAGS.cmake +++ b/cmake/Modules/FindGFLAGS.cmake @@ -78,6 +78,7 @@ else() /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGFORTRAN.cmake b/cmake/Modules/FindGFORTRAN.cmake index a6eb38a53..89530518d 100644 --- a/cmake/Modules/FindGFORTRAN.cmake +++ b/cmake/Modules/FindGFORTRAN.cmake @@ -89,6 +89,7 @@ find_library(GFORTRAN NAMES gfortran /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /usr/local/lib/i386 diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index e483dfbe9..4805b3eaf 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -71,6 +71,7 @@ macro(_FIND_GLOG_LIBRARIES _var) /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGNURADIO.cmake b/cmake/Modules/FindGNURADIO.cmake index 5ce37cba6..9855ddc29 100644 --- a/cmake/Modules/FindGNURADIO.cmake +++ b/cmake/Modules/FindGNURADIO.cmake @@ -131,6 +131,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGRIIO.cmake b/cmake/Modules/FindGRIIO.cmake index e08290252..1abd5caf4 100644 --- a/cmake/Modules/FindGRIIO.cmake +++ b/cmake/Modules/FindGRIIO.cmake @@ -96,6 +96,7 @@ find_library(IIO_LIBRARIES /usr/lib/sparc64-linux-gnu /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGRLIMESDR.cmake b/cmake/Modules/FindGRLIMESDR.cmake index cfd546feb..2fb60cb3f 100644 --- a/cmake/Modules/FindGRLIMESDR.cmake +++ b/cmake/Modules/FindGRLIMESDR.cmake @@ -96,6 +96,7 @@ find_library(GRLIMESDR_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/riscv64-linux-gnu /usr/lib/alpha-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindGROSMOSDR.cmake b/cmake/Modules/FindGROSMOSDR.cmake index cfaef1494..22ee7d51e 100644 --- a/cmake/Modules/FindGROSMOSDR.cmake +++ b/cmake/Modules/FindGROSMOSDR.cmake @@ -96,6 +96,7 @@ find_library(GROSMOSDR_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/riscv64-linux-gnu /usr/lib/alpha-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindLIBAD9361.cmake b/cmake/Modules/FindLIBAD9361.cmake index 80df49673..e1ff8e4a3 100644 --- a/cmake/Modules/FindLIBAD9361.cmake +++ b/cmake/Modules/FindLIBAD9361.cmake @@ -75,6 +75,7 @@ find_library(LIBAD9361_LIBRARIES /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/cmake/Modules/FindLIBIIO.cmake b/cmake/Modules/FindLIBIIO.cmake index 31f152b6f..44f4d367e 100644 --- a/cmake/Modules/FindLIBIIO.cmake +++ b/cmake/Modules/FindLIBIIO.cmake @@ -77,6 +77,7 @@ find_library( /usr/lib/x86_64-linux-gnux32 /usr/lib/sh4-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0a1b7fee4..7fb402e3a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -14,10 +14,20 @@ All notable changes to GNSS-SDR will be documented in this file. ## [Unreleased](https://github.com/gnss-sdr/gnss-sdr/tree/next) -### Improvements in Usability +### Improvements in Portability: + +- Fix building against google-glog 0.7.0 +- Find dependencies in the loongarch64 architecture. + +### Improvements in Usability: - Tidy up the `conf/` folder. +See the definitions of concepts and metrics at +https://gnss-sdr.org/design-forces/ + +  + ## [GNSS-SDR v0.0.19.1](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.19.1) - 2024-01-26 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10579595.svg)](https://doi.org/10.5281/zenodo.10579595) From fbca34a4b41bfeefed02e2796efcd3e3648dce07 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 21 Feb 2024 17:49:24 +0100 Subject: [PATCH 02/13] Fix typo in changelog --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7fb402e3a..c453414f6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -112,7 +112,7 @@ https://gnss-sdr.org/design-forces/ overkilling nine (the ninth decimal place worths up to 110 microns). Similarly, height in meters is now reported with two decimal places instead of three, and velocity in m/s also with two decimal places instead of three. -- Fixed the rate at which KLM, GPX, GeoJSON, and NMEA annotations are made. The +- Fixed the rate at which KML, GPX, GeoJSON, and NMEA annotations are made. The rate is now set by `PVT.output_rate_ms` (`500` ms by default), and can be particularized by `PVT.kml_rate_ms`, `PVT.gpx_rate_ms`, `PVT.geojson_rate_ms`, and `PVT.nmea_rate_ms`. Those values should be multiples of From 8e5d636132f111c8e2927ff4375ca7e2c40f0f5d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 23 Feb 2024 12:52:32 +0100 Subject: [PATCH 03/13] Bump local version of googletest to v1.14.0 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 245d429eb..bda1423c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -341,7 +341,7 @@ set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.0") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.26") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "25.0") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.14") -set(GNSSSDR_GTEST_LOCAL_VERSION "1.13.0") +set(GNSSSDR_GTEST_LOCAL_VERSION "1.14.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GNSSTK_LOCAL_VERSION "14.0.0") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.8.3") @@ -375,6 +375,10 @@ if(CMAKE_CROSSCOMPILING OR CMAKE_VERSION VERSION_LESS "3.13") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12") endif() +if(CMAKE_VERSION VERSION_LESS "3.13") + set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.1") +endif() + if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR CMAKE_VERSION VERSION_LESS 3.5) From 0a66cca3819458bb462b3fd3edb80bf025041387 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 25 Feb 2024 08:20:56 +0100 Subject: [PATCH 04/13] Fix for glog 0.7.0 --- cmake/Modules/FindGLOG.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 4805b3eaf..bef1f7b6a 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -179,3 +179,8 @@ if(GLOG_FOUND AND NOT TARGET Glog::glog) INTERFACE_LINK_LIBRARIES "${GLOG_LIBRARIES}" ) endif() + +# Fix for glog 0.7.0 +if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) + target_precompile_headers(Glog::glog INTERFACE ${GLOG_INCLUDE_DIRS}/export.h) +endif() \ No newline at end of file From a10a465d304298b1b73dfb57d5745932077b704d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 25 Feb 2024 10:08:43 +0100 Subject: [PATCH 05/13] Be more strict in googletest requirements --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bda1423c2..5c1eeddc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -375,7 +375,9 @@ if(CMAKE_CROSSCOMPILING OR CMAKE_VERSION VERSION_LESS "3.13") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "21.12") endif() -if(CMAKE_VERSION VERSION_LESS "3.13") +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 "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)) set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.1") endif() From 661a8aec0b7174e749f905660242f462d42efad4 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 25 Feb 2024 10:32:34 +0100 Subject: [PATCH 06/13] Fix googletest tag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c1eeddc7..8aa6c5190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -378,7 +378,7 @@ endif() 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 "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)) - set(GNSSSDR_GTEST_LOCAL_VERSION "1.12.1") + set(GNSSSDR_GTEST_LOCAL_VERSION "1.13.0") endif() if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR From 2988e2ac4a69e3d3c7906e091da6a3f1e39d5f1d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 26 Feb 2024 14:44:20 +0100 Subject: [PATCH 07/13] Fix CI for macos-based jobs --- .github/workflows/main.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 183a871ef..eeecbaf38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja hdf5 automake armadillo lapack libmatio \ - gflags glog gnuradio log4cpp openssl pugixml protobuf - pip3 install mako + gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako - name: configure run: cd build && cmake -GNinja .. - name: build @@ -83,8 +82,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja pkg-config hdf5 automake armadillo lapack libmatio \ - gflags glog gnuradio log4cpp openssl pugixml protobuf - pip3 install mako + gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako - name: configure run: cd build && cmake -GXcode .. - name: build @@ -131,8 +129,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio \ - log4cpp openssl pugixml protobuf - pip3 install mako + log4cpp openssl pugixml protobuf python-mako ln -s $(brew --prefix llvm)/bin/clang-tidy /usr/local/bin ln -s $(brew --prefix llvm)/bin/clang-apply-replacements /usr/local/bin ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin From ccbbd7b2e41f1ce5a58860ad1d6249924eb64b0f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 26 Feb 2024 15:05:01 +0100 Subject: [PATCH 08/13] Fix clang-tidy job --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eeecbaf38..56e631df8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2020-2022 Carles Fernandez-Prades +# SPDX-FileCopyrightText: 2020-2024 Carles Fernandez-Prades name: Simple CI on: @@ -134,7 +134,7 @@ jobs: ln -s $(brew --prefix llvm)/bin/clang-apply-replacements /usr/local/bin ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin - name: Prepare run - run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.13.0 core_monitor core_libs pvt_libs + run: cd build && cmake .. && make volk_gnsssdr_module gtest-1.14.0 core_monitor core_libs pvt_libs - name: run clang-tidy run: cd build && run-clang-tidy -fix - name: check From 5a7087f3a75667882cb00dc361fb2d6f97de4e84 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 08:08:53 +0100 Subject: [PATCH 09/13] Fix clang-tidy CI job --- CMakeLists.txt | 3 +++ cmake/Modules/FindGLOG.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8aa6c5190..02724fe03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1815,6 +1815,9 @@ ${GNSSSDR_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configu endif() if(NOT (CMAKE_VERSION VERSION_LESS "3.22")) target_precompile_headers(Glog::glog INTERFACE ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) + endif() endif() if(LIBUNWIND_FOUND) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index bef1f7b6a..3bec26aa9 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -183,4 +183,7 @@ endif() # Fix for glog 0.7.0 if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) target_precompile_headers(Glog::glog INTERFACE ${GLOG_INCLUDE_DIRS}/export.h) + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GLOG_INCLUDE_DIRS}/export.h) + endif() endif() \ No newline at end of file From cb42c595541a605faeae206c4e5a77e044d25324 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 08:27:22 +0100 Subject: [PATCH 10/13] Fix homebrew instructions in README.md file --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 7e9fd62d9..e745bf336 100644 --- a/README.md +++ b/README.md @@ -867,20 +867,12 @@ $ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/inst The script explains what it will do, and then it pauses before doing it. There are more installation options [here](https://docs.brew.sh/Installation.html). -Install pip3: - -``` -$ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -$ sudo python3 get-pip.py -``` - Install the required dependencies: ``` $ brew update && brew upgrade $ brew install armadillo cmake hdf5 gflags glog gnuradio libmatio log4cpp \ - openssl pkg-config protobuf pugixml -$ pip3 install mako + openssl pkg-config protobuf pugixml pyhon-mako $ brew install --cask mactex # when completed, restart Terminal $ brew install graphviz doxygen ``` From 7a58a3e39b924c282e133521da1876c74169de9f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 13:45:38 +0100 Subject: [PATCH 11/13] Better way to consume google-glog --- CMakeLists.txt | 7 +++---- cmake/Modules/FindGLOG.cmake | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02724fe03..889c6e09c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1814,10 +1814,9 @@ ${GNSSSDR_BINARY_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/configu endif() endif() if(NOT (CMAKE_VERSION VERSION_LESS "3.22")) - target_precompile_headers(Glog::glog INTERFACE ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GNSSSDR_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/glog/export.h) - endif() + set_target_properties(Glog::glog PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT;GLOG_USE_GFLAGS" + INTERFACE_COMPILE_FEATURES "cxx_std_14") endif() if(LIBUNWIND_FOUND) diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 3bec26aa9..6c506643e 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -182,8 +182,5 @@ endif() # Fix for glog 0.7.0 if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) - target_precompile_headers(Glog::glog INTERFACE ${GLOG_INCLUDE_DIRS}/export.h) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH -Winvalid-pch -x c++-header -include ${GLOG_INCLUDE_DIRS}/export.h) - endif() + set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT") endif() \ No newline at end of file From 31f8e65c6d833baba6a4565705cdd71a0403b154 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 15:52:49 +0100 Subject: [PATCH 12/13] CI: update uraimo/run-on-arch-action --- .github/workflows/gnss-sdr_archs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gnss-sdr_archs.yml b/.github/workflows/gnss-sdr_archs.yml index 6ba71fb64..ca9595187 100644 --- a/.github/workflows/gnss-sdr_archs.yml +++ b/.github/workflows/gnss-sdr_archs.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.6.0 + - uses: uraimo/run-on-arch-action@v2.7.1 name: Test in non-x86 container continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} id: test From 15264a69e89b0f6de2ea3be9188a8a83d07810b8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 27 Feb 2024 16:48:14 +0100 Subject: [PATCH 13/13] CI: update actions --- .github/workflows/citation.yml | 2 +- .github/workflows/volk_gnsssdr_archs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/citation.yml b/.github/workflows/citation.yml index 9de637fed..db667992c 100644 --- a/.github/workflows/citation.yml +++ b/.github/workflows/citation.yml @@ -24,7 +24,7 @@ jobs: uses: dieghernan/cff-validator@main # Upload artifact in case of failure - name: Update artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: citation-cff-errors diff --git a/.github/workflows/volk_gnsssdr_archs.yml b/.github/workflows/volk_gnsssdr_archs.yml index 0e3489647..734cda533 100644 --- a/.github/workflows/volk_gnsssdr_archs.yml +++ b/.github/workflows/volk_gnsssdr_archs.yml @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.6.0 + - uses: uraimo/run-on-arch-action@v2.7.2 name: Build in non-x86 container # continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} id: build