mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-11 22:42:55 +00:00
Code Issues Releases Wiki Activity

hotfix: fix building against google-glog 0.7.0, fix CI

Browse Source
This commit is contained in:
Carles Fernandez 2024-02-27 23:29:08 +01:00
parent c94b2ddfe8
commit 87fcfd237d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
10 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/citation.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
uses: dieghernan/cff-validator@main uses: dieghernan/cff-validator@main
# Upload artifact in case of failure # Upload artifact in case of failure
- name: Update artifact - name: Update artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
if: failure() if: failure()
with: with:
name: citation-cff-errors name: citation-cff-errors

2
.github/workflows/gnss-sdr_archs.yml vendored
View File

@ -41,7 +41,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - 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 name: Test in non-x86 container
continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }}
id: test id: test

9
.github/workflows/main.yml vendored
View File

@ -54,8 +54,7 @@ jobs:
rm /usr/local/bin/python3.1* || true rm /usr/local/bin/python3.1* || true
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew install ninja hdf5 automake armadillo lapack libmatio \ brew install ninja hdf5 automake armadillo lapack libmatio \
gflags glog gnuradio log4cpp openssl pugixml protobuf gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako
pip3 install mako
- name: configure - name: configure
run: cd build && cmake -GNinja .. run: cd build && cmake -GNinja ..
- name: build - name: build
@ -83,8 +82,7 @@ jobs:
rm /usr/local/bin/python3.1* || true rm /usr/local/bin/python3.1* || true
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew install ninja pkg-config hdf5 automake armadillo lapack libmatio \ brew install ninja pkg-config hdf5 automake armadillo lapack libmatio \
gflags glog gnuradio log4cpp openssl pugixml protobuf gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako
pip3 install mako
- name: configure - name: configure
run: cd build && cmake -GXcode .. run: cd build && cmake -GXcode ..
- name: build - name: build
@ -131,8 +129,7 @@ jobs:
rm /usr/local/bin/python3.1* || true rm /usr/local/bin/python3.1* || true
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio \ brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio \
log4cpp openssl pugixml protobuf log4cpp openssl pugixml protobuf python-mako
pip3 install mako
ln -s $(brew --prefix llvm)/bin/clang-tidy /usr/local/bin 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/clang-apply-replacements /usr/local/bin
ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin

2
.github/workflows/volk_gnsssdr_archs.yml vendored
View File

@ -45,7 +45,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: uraimo/run-on-arch-action@v2.6.0 - uses: uraimo/run-on-arch-action@v2.7.1
name: Build in non-x86 container name: Build in non-x86 container
# continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} # continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }}
id: build id: build

2
CMakeLists.txt
View File

@ -142,7 +142,7 @@ option(ENABLE_ORC "Use (if available) the Optimized Inner Loop Runtime Compiler
################################################################################ ################################################################################
# GNSS-SDR version information # GNSS-SDR version information
################################################################################ ################################################################################
set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications. set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications.
if(NOT ${THIS_IS_A_RELEASE}) if(NOT ${THIS_IS_A_RELEASE})
find_package(Git) find_package(Git)
set_package_properties(Git PROPERTIES set_package_properties(Git PROPERTIES

6
cmake/Modules/FindGLOG.cmake
View File

@ -71,6 +71,7 @@ macro(_FIND_GLOG_LIBRARIES _var)
/usr/lib/x86_64-linux-gnux32 /usr/lib/x86_64-linux-gnux32
/usr/lib/alpha-linux-gnu /usr/lib/alpha-linux-gnu
/usr/lib/riscv64-linux-gnu /usr/lib/riscv64-linux-gnu
/usr/lib/loongarch64-linux-gnu
/usr/local/lib /usr/local/lib
/usr/local/lib64 /usr/local/lib64
/opt/local/lib /opt/local/lib
@ -178,3 +179,8 @@ if(GLOG_FOUND AND NOT TARGET Glog::glog)
INTERFACE_LINK_LIBRARIES "${GLOG_LIBRARIES}" INTERFACE_LINK_LIBRARIES "${GLOG_LIBRARIES}"
) )
endif() endif()
# Fix for glog 0.7.0
if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h)
set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT")
endif()

1
src/algorithms/signal_source/libs/fpga_buffer_monitor.cc
View File

@ -31,6 +31,7 @@
#include <fstream> // for string, ofstream #include <fstream> // for string, ofstream
#include <iostream> // for cout #include <iostream> // for cout
#include <sys/mman.h> // for mmap #include <sys/mman.h> // for mmap
#include <unistd.h> // for close
#include <utility> // for move #include <utility> // for move

1
src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc
View File

@ -25,6 +25,7 @@
#include <fcntl.h> // for open, O_RDWR, O_SYNC #include <fcntl.h> // for open, O_RDWR, O_SYNC
#include <iostream> // for cout #include <iostream> // for cout
#include <sys/mman.h> // for mmap #include <sys/mman.h> // for mmap
#include <unistd.h> // for close
Fpga_dynamic_bit_selection::Fpga_dynamic_bit_selection(bool enable_rx1_band, bool enable_rx2_band) Fpga_dynamic_bit_selection::Fpga_dynamic_bit_selection(bool enable_rx1_band, bool enable_rx2_band)
: d_map_base_freq_band_1(nullptr), : d_map_base_freq_band_1(nullptr),

1
src/algorithms/signal_source/libs/fpga_switch.cc
View File

@ -25,6 +25,7 @@
#include <fcntl.h> // for open, O_RDWR, O_SYNC #include <fcntl.h> // for open, O_RDWR, O_SYNC
#include <iostream> // for cout #include <iostream> // for cout
#include <sys/mman.h> // for mmap #include <sys/mman.h> // for mmap
#include <unistd.h> // for close
Fpga_Switch::Fpga_Switch(const std::string &device_name) Fpga_Switch::Fpga_Switch(const std::string &device_name)
{ {

2
src/tests/system-tests/position_test.cc
View File

@ -312,7 +312,7 @@ int PositionSystemTest::configure_receiver()
// Set PVT // Set PVT
config->set_property("PVT.implementation", "RTKLIB_PVT"); config->set_property("PVT.implementation", "RTKLIB_PVT");
config->set_property("PVT.enable_pvt_kf", "true"), config->set_property("PVT.enable_pvt_kf", "true");
config->set_property("PVT.positioning_mode", "PPP_Static"); config->set_property("PVT.positioning_mode", "PPP_Static");
config->set_property("PVT.output_rate_ms", std::to_string(output_rate_ms)); config->set_property("PVT.output_rate_ms", std::to_string(output_rate_ms));
config->set_property("PVT.display_rate_ms", std::to_string(display_rate_ms)); config->set_property("PVT.display_rate_ms", std::to_string(display_rate_ms));