Merge branch 'master' into devel

nim65s · nim65s · commit 54e8fbd03332 · 2021-02-09T20:18:05.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,12 @@ IF(BUILD_TESTING)
   FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
 ENDIF(BUILD_TESTING)
 
+IF(Boost_VERSION GREATER 107299 OR Boost_VERSION_MACRO GREATER 107299)
+  # Silence a warning about a deprecated use of boost bind by boost >= 1.73
+  # without dropping support for boost < 1.73
+  ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+ENDIF()
+
 # Main Library
 SET(${PROJECT_NAME}_HEADERS
   include/${CUSTOM_HEADER_DIR}/api.hh
diff --git a/cmake b/cmake
@@ -1 +1 @@
-Subproject commit 59d817dca29527e98bdbef555e09f25358810cae
+Subproject commit 0428d826ca92afb5933b7cb9deb521f2f4d8cfa1
diff --git a/include/dynamic-graph/python/signal-wrapper.hh b/include/dynamic-graph/python/signal-wrapper.hh
@@ -5,6 +5,7 @@
 #define DGPY_SIGNAL_WRAPPER
 
 #include <boost/python.hpp>
+#include <boost/bind.hpp>
 
 #include <dynamic-graph/linear-algebra.h>
 #include <dynamic-graph/signal.h>
diff --git a/tests/custom_entity.cpp b/tests/custom_entity.cpp
@@ -6,6 +6,7 @@
 #define ENABLE_RT_LOG
 
 #include "custom_entity.h"
+#include <boost/bind.hpp>
 
 #include <dynamic-graph/command-bind.h>
 #include <dynamic-graph/entity.h>
