Merge pull request #738 from galenguyer/develop

Multiple CMake fixes and version updates to resolve compiler warnings
robotastic · Dec 20, 2022 · 7c57eb5 · 7c57eb5
2 parents 7ad2d92 + 2d248ed
commit 7c57eb5
Show file tree

Hide file tree

Showing 297 changed files with 46,791 additions and 14,118 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Update Eigen to version 3.4
+68291f6f901eef5cbfa21bc2a57483044123de43
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,5 @@ cmake-build-debug/
 /out/
 top_block.py
 debug_recorder.py
+/cmake_build/
+/.cache/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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})
@@ -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")
 

diff --git a/cmake/Modules/FindGnuradioOsmosdr.cmake b/cmake/Modules/FindGnuradioOsmosdr.cmake
@@ -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
 )
 

diff --git a/lib/lfsr/Eigen/Cholesky b/lib/lfsr/Eigen/Cholesky
@@ -9,6 +9,7 @@
 #define EIGEN_CHOLESKY_MODULE_H
 
 #include "Core"
+#include "Jacobi"
 
 #include "src/Core/util/DisableStupidWarnings.h"
 
@@ -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: */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Update Eigen to version 3.4
		68291f6f901eef5cbfa21bc2a57483044123de43