Unverified Commit 048d8ca9 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #81 from nim65s/devel

move doc/make CommandVoid 5-8 to dynamic-graph
parents ab3e013b dfd72e42
Pipeline #15653 passed with stage
in 26 minutes and 44 seconds
......@@ -9,6 +9,7 @@
#include <boost/function.hpp>
/* --- COMMON INCLUDE -------------------------------------------------- */
#include <dynamic-graph/config.hh>
#include <dynamic-graph/command.h>
#include <dynamic-graph/command-direct-setter.h>
#include <dynamic-graph/command-direct-getter.h>
......@@ -23,18 +24,40 @@ using ::dynamicgraph::command::docCommandVerbose;
using ::dynamicgraph::command::docCommandVoid0;
using ::dynamicgraph::command::docCommandVoid1;
using ::dynamicgraph::command::docCommandVoid2;
using ::dynamicgraph::command::docCommandVoid3;
using ::dynamicgraph::command::docCommandVoid4;
using ::dynamicgraph::command::docDirectGetter;
using ::dynamicgraph::command::docDirectSetter;
using ::dynamicgraph::command::makeCommandVerbose;
using ::dynamicgraph::command::makeCommandVoid0;
using ::dynamicgraph::command::makeCommandVoid1;
using ::dynamicgraph::command::makeCommandVoid2;
using ::dynamicgraph::command::makeCommandVoid3;
using ::dynamicgraph::command::makeCommandVoid4;
using ::dynamicgraph::command::makeDirectGetter;
using ::dynamicgraph::command::makeDirectSetter;
} // namespace torquecontrol
} // namespace sot
} // namespace dynamicgraph
#if DYNAMIC_GRAPH_VERSION_AT_LEAST(4, 4, 0)
namespace dynamicgraph {
namespace sot {
namespace dg = dynamicgraph;
namespace torquecontrol {
using ::dynamicgraph::command::docCommandVoid5;
using ::dynamicgraph::command::docCommandVoid6;
using ::dynamicgraph::command::docCommandVoid7;
using ::dynamicgraph::command::docCommandVoid8;
using ::dynamicgraph::command::makeCommandVoid5;
using ::dynamicgraph::command::makeCommandVoid6;
using ::dynamicgraph::command::makeCommandVoid7;
using ::dynamicgraph::command::makeCommandVoid8;
} // namespace torquecontrol
} // namespace sot
} // namespace dynamicgraph
#else
namespace dynamicgraph {
namespace command {
......@@ -229,5 +252,6 @@ inline std::string docCommandVoid7(const std::string& doc, const std::string& ty
} // namespace command
} // namespace dynamicgraph
#endif
#endif // __sot_torquecontrol_commands_helper_H__
......@@ -27,7 +27,7 @@ ENDIF(DDP_ACTUATOR_SOLVER_FOUND)
FOREACH(plugin ${plugins})
GET_FILENAME_COMPONENT(LIBRARY_NAME ${plugin} NAME)
ADD_LIBRARY(${LIBRARY_NAME} SHARED ${plugin})
ADD_LIBRARY(${LIBRARY_NAME} SHARED "${plugin}.cpp")
IF(SUFFIX_SO_VERSION)
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
......
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