From 9390116f981bc52a3992f785efd34c32c3f6012e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 1 Sep 2020 15:29:05 +0200
Subject: [PATCH] update for dynamic-graph-python v4
---
CMakeLists.txt | 5 +++--
src/CMakeLists.txt | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089adac..80ba82f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,18 +35,19 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
# Project dependencies
SET(CATKIN_REQUIRED_COMPONENTS roscpp std_msgs message_generation std_srvs geometry_msgs sensor_msgs tf2_ros
realtime_tools)
+FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options)
IF(BUILD_PYTHON_INTERFACE)
FINDPYTHON()
+ SEARCH_FOR_BOOST_PYTHON()
STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
- ADD_PROJECT_DEPENDENCY(dynamic-graph-python REQUIRED
+ ADD_PROJECT_DEPENDENCY(dynamic-graph-python 4.0.0 REQUIRED
PKG_CONFIG_REQUIRES dynamic-graph-python)
SET(CATKIN_REQUIRED_COMPONENTS ${CATKIN_REQUIRED_COMPONENTS} rospy)
ENDIF(BUILD_PYTHON_INTERFACE)
find_package(catkin REQUIRED COMPONENTS ${CATKIN_REQUIRED_COMPONENTS})
-SEARCH_FOR_BOOST()
ADD_PROJECT_DEPENDENCY(sot-core REQUIRED PKG_CONFIG_REQUIRES sot-core)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1917df..fef176b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,13 +50,13 @@ ENDIF(BUILD_PYTHON_INTERFACE)
# Stand alone embedded intepreter with a robot controller.
add_executable(geometric_simu geometric_simu.cpp sot_loader.cpp sot_loader_basic.cpp)
-target_link_libraries(geometric_simu ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
+target_link_libraries(geometric_simu Boost::program_options ${CMAKE_DL_LIBS} ${catkin_LIBRARIES} ros_bridge)
pkg_config_use_dependency(geometric_simu dynamic_graph_bridge_msgs)
install(TARGETS geometric_simu
DESTINATION lib/${PROJECT_NAME})
# Sot loader library
add_library(sot_loader sot_loader.cpp sot_loader_basic.cpp)
-target_link_libraries(sot_loader ${Boost_LIBRARIES} ${catkin_LIBRARIES} ros_bridge)
+target_link_libraries(sot_loader Boost::program_options ${catkin_LIBRARIES} ros_bridge)
pkg_config_use_dependency(sot_loader dynamic_graph_bridge_msgs)
install(TARGETS sot_loader EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
--
GitLab