From 59e3df780f1cf7f3162060570998f884e473c267 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Wed, 14 Dec 2011 19:54:16 +0100
Subject: [PATCH] Make rosInit callable from outside.
---
CMakeLists.txt | 4 +++-
{src => include/dynamic_graph_bridge}/ros_init.hh | 0
manifest.xml | 8 ++++++++
src/ros_export.cpp | 2 +-
src/ros_import.cpp | 2 +-
src/ros_init.cpp | 2 +-
6 files changed, 14 insertions(+), 4 deletions(-)
rename {src => include/dynamic_graph_bridge}/ros_init.hh (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b60760d..bbc4afa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,11 @@ pkg_check_modules(JRL_MAL REQUIRED jrl-mal)
pkg_check_modules(DYNAMIC_GRAPH REQUIRED dynamic-graph)
pkg_check_modules(SOT_CORE REQUIRED sot-core)
+include_directories(include)
+
rosbuild_add_library(ros_bridge
src/converter.hh
- src/ros_init.hh src/ros_init.cpp
+ include/dynamic_graph_bridge/ros_init.hh src/ros_init.cpp
src/sot_to_ros.hh src/sot_to_ros.cpp
)
diff --git a/src/ros_init.hh b/include/dynamic_graph_bridge/ros_init.hh
similarity index 100%
rename from src/ros_init.hh
rename to include/dynamic_graph_bridge/ros_init.hh
diff --git a/manifest.xml b/manifest.xml
index 330570b..42a6103 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -9,6 +9,14 @@
<review status="unreviewed" notes=""/>
<url>http://ros.org/wiki/dynamic-graph-bridge</url>
+ <export>
+ <cpp
+ cflags="-I${prefix}/include"
+ lflags="-L${prefix}/lib -lros_bridge -Wl,-rpath=${prefix}/lib"
+ />
+ </export>
+
+
<rosdep name="boost"/>
<rosdep name="jrl-mal"/>
diff --git a/src/ros_export.cpp b/src/ros_export.cpp
index f6d778c..b1a2736 100644
--- a/src/ros_export.cpp
+++ b/src/ros_export.cpp
@@ -9,7 +9,7 @@
#include <dynamic-graph/factory.h>
-#include "ros_init.hh"
+#include "dynamic_graph_bridge/ros_init.hh"
#include "ros_export.hh"
namespace dynamicgraph
diff --git a/src/ros_import.cpp b/src/ros_import.cpp
index 3f41fce..1f007a4 100644
--- a/src/ros_import.cpp
+++ b/src/ros_import.cpp
@@ -13,7 +13,7 @@
#include <dynamic-graph/factory.h>
#include <dynamic-graph/command.h>
-#include "ros_init.hh"
+#include "dynamic_graph_bridge/ros_init.hh"
#include "ros_import.hh"
namespace dynamicgraph
diff --git a/src/ros_init.cpp b/src/ros_init.cpp
index 8f21c05..fc7c83f 100644
--- a/src/ros_init.cpp
+++ b/src/ros_init.cpp
@@ -1,7 +1,7 @@
#include <boost/make_shared.hpp>
#include <boost/shared_ptr.hpp>
-#include "ros_init.hh"
+#include "dynamic_graph_bridge/ros_init.hh"
namespace dynamicgraph
{
--
GitLab