Skip to content
Snippets Groups Projects
Commit 2aaa48f0 authored by Olivier Stasse's avatar Olivier Stasse
Browse files

Create a sot_loader library to simplifies the embedding on a new robot.

parent fa674630
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,7 @@ set(CUSTOM_HEADER_DIR dynamic_graph_bridge) ...@@ -36,6 +36,7 @@ set(CUSTOM_HEADER_DIR dynamic_graph_bridge)
set(${PROJECT_NAME}_HEADERS set(${PROJECT_NAME}_HEADERS
include/dynamic_graph_bridge/ros_init.hh include/dynamic_graph_bridge/ros_init.hh
include/dynamic_graph_bridge/ros_interpreter.hh include/dynamic_graph_bridge/ros_interpreter.hh
include/dynamic_graph_bridge/sot_loader.hh
) )
include(cmake/base.cmake) include(cmake/base.cmake)
include(cmake/ros.cmake) include(cmake/ros.cmake)
...@@ -153,6 +154,14 @@ add_executable(geometric_simu src/geometric_simu.cpp src/sot_loader.cpp) ...@@ -153,6 +154,14 @@ add_executable(geometric_simu src/geometric_simu.cpp src/sot_loader.cpp)
pkg_config_use_dependency(geometric_simu roscpp) pkg_config_use_dependency(geometric_simu roscpp)
target_link_libraries(geometric_simu ros_bridge ${Boost_LIBRARIES} dl) target_link_libraries(geometric_simu ros_bridge ${Boost_LIBRARIES} dl)
# Sot loader library
add_library(sot_loader src/sot_loader.cpp)
pkg_config_use_dependency(sot_loader dynamic-graph)
pkg_config_use_dependency(sot_loader sot-core)
target_link_libraries(sot_loader ${Boost_LIBRARIES})
install(TARGETS sot_loader DESTINATION lib)
add_subdirectory(src) add_subdirectory(src)
# Deal with the ROS part. # Deal with the ROS part.
......
File moved
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
#include <boost/thread/condition.hpp> #include <boost/thread/condition.hpp>
#include "sot_loader.hh" #include <dynamic_graph_bridge/sot_loader.hh>
boost::condition_variable cond; boost::condition_variable cond;
boost::mutex mut; boost::mutex mut;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/* --- INCLUDES ------------------------------------------------------------- */ /* --- INCLUDES ------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
#include "sot_loader.hh" #include <dynamic_graph_bridge/sot_loader.hh>
// POSIX.1-2001 // POSIX.1-2001
#include <dlfcn.h> #include <dlfcn.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment