Commit 54e8fbd0 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Merge branch 'master' into devel

parents 191ac46a c01d3e86
Pipeline #13123 passed with stage
in 8 minutes and 36 seconds
......@@ -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
......
Subproject commit 59d817dca29527e98bdbef555e09f25358810cae
Subproject commit 0428d826ca92afb5933b7cb9deb521f2f4d8cfa1
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment