Skip to content

Commit

Permalink
hotfix: fix building against google-glog 0.7.0, fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesfernandez committed Feb 27, 2024
1 parent c94b2dd commit 87fcfd2
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/citation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gnss-sdr_archs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/volk_gnsssdr_archs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
name: Build in non-x86 container
# continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }}
id: build
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ option(ENABLE_ORC "Use (if available) the Optimized Inner Loop Runtime Compiler
################################################################################
# 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})
find_package(Git)
set_package_properties(Git PROPERTIES
Expand Down
6 changes: 6 additions & 0 deletions cmake/Modules/FindGLOG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -178,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)
set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT")
endif()
1 change: 1 addition & 0 deletions src/algorithms/signal_source/libs/fpga_buffer_monitor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <fstream> // for string, ofstream
#include <iostream> // for cout
#include <sys/mman.h> // for mmap
#include <unistd.h> // for close
#include <utility> // for move


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <fcntl.h> // for open, O_RDWR, O_SYNC
#include <iostream> // for cout
#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)
: d_map_base_freq_band_1(nullptr),
Expand Down
1 change: 1 addition & 0 deletions src/algorithms/signal_source/libs/fpga_switch.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <fcntl.h> // for open, O_RDWR, O_SYNC
#include <iostream> // for cout
#include <sys/mman.h> // for mmap
#include <unistd.h> // for close

Fpga_Switch::Fpga_Switch(const std::string &device_name)
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/system-tests/position_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ int PositionSystemTest::configure_receiver()

// Set 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.output_rate_ms", std::to_string(output_rate_ms));
config->set_property("PVT.display_rate_ms", std::to_string(display_rate_ms));
Expand Down

0 comments on commit 87fcfd2

Please sign in to comment.