Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple CMake fixes and version updates to resolve compiler warnings #738

Merged
merged 6 commits into from
Dec 20, 2022
Merged

Multiple CMake fixes and version updates to resolve compiler warnings #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c79446
Resolve global boost placeholder warning
galenguyer Nov 29, 2022
726aeed
Remove SPDLOG_FMT_EXTERNAL re-declaration
galenguyer Nov 29, 2022
bf45228
Upgrade C++ version from 11 to 17
galenguyer Nov 29, 2022
ad6cf8a
Update vendored Eigen to version 3.4
galenguyer Nov 29, 2022
7152185
Properly find OsmoSDR include dirs
galenguyer Nov 29, 2022
2d248ed
clearing up code related errors in the build
robotastic Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Update Eigen to version 3.4
68291f6f901eef5cbfa21bc2a57483044123de43
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ cmake-build-debug/
/out/
top_block.py
debug_recorder.py
/cmake_build/
/.cache/
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ if(NOT Boost_FOUND)
endif()

ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK)
ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
if(NOT EXISTS /usr/include/spdlog/fmt/bundled)
ADD_DEFINITIONS(-DSPDLOG_FMT_EXTERNAL=ON)
ADD_DEFINITIONS(-DSPDLOG_FMT_EXTERNAL)
endif()
add_definitions(-DGNURADIO_VERSION=${GNURADIO_VERSION})
message(STATUS "Gnuradio Version is: " ${Gnuradio_VERSION})
Expand Down Expand Up @@ -229,7 +230,7 @@ link_directories(

set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Wno-unused-local-typedef -Wno-deprecated-declarations -Wno-error=deprecated-declarations -g3")

SET(CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_STANDARD 17)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wno-narrowing -fvisibility=hidden -fPIC")

Expand Down
8 changes: 4 additions & 4 deletions cmake/Modules/FindGnuradioOsmosdr.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PKG_CHECK_MODULES(GNURADIO_OSMOSDR gnuradio-osmosdr)
PKG_CHECK_MODULES(PC_GNURADIO_OSMOSDR gnuradio-osmosdr)

FIND_PATH(
GNURADIO_OSMOSDR_INCLUDE_DIRS
NAMES osmosdr/source.h
HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include
${GNURADIO_OSMOSDR_INCLUDEDIR}
${GNURADIO_OSMOSDR_INCLUDE_DIRS}
${CMAKE_INSTALL_PREFIX}/include/osmosdr
PATHS /usr/local/include/osmosdr
/usr/include/osmosdr
${CMAKE_INSTALL_PREFIX}/include
PATHS /usr/local/include
/usr/include
/opt/local/include
)

Expand Down
6 changes: 5 additions & 1 deletion lib/lfsr/Eigen/Cholesky
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define EIGEN_CHOLESKY_MODULE_H

#include "Core"
#include "Jacobi"

#include "src/Core/util/DisableStupidWarnings.h"

Expand All @@ -31,11 +32,14 @@
#include "src/Cholesky/LLT.h"
#include "src/Cholesky/LDLT.h"
#ifdef EIGEN_USE_LAPACKE
#ifdef EIGEN_USE_MKL
#include "mkl_lapacke.h"
#else
#include "src/misc/lapacke.h"
#endif
#include "src/Cholesky/LLT_LAPACKE.h"
#endif

#include "src/Core/util/ReenableStupidWarnings.h"

#endif // EIGEN_CHOLESKY_MODULE_H
/* vim: set filetype=cpp et sw=2 ts=2 ai: */
Loading