Change lib name to sot-dynamic and dynamic plugin name to dynamic

CMakeLists.txt

@@ -48,7 +48,7 @@ ADD_REQUIRED_DEPENDENCY("sot-core >= 2.5")
 ADD_REQUIRED_DEPENDENCY("sot-tools")
 
 # List plug-ins that will be compiled.
-SET(libs
+SET(plugins
   zmpreffromcom
   force-compensation
   integrator-force-exact
@@ -60,14 +60,14 @@ SET(libs
   zmp-from-forces
   )
 
-LIST(APPEND libs dynamic_plugin)
+SET(LIBRARY_NAME ${PROJECT_NAME})
+LIST(APPEND plugins dynamic)
 
 
-LIST(APPEND LOGGING_WATCHED_TARGETS ${libs})
+LIST(APPEND LOGGING_WATCHED_TARGETS ${plugins})
 
 # Add dependency toward sot-dynamic library in pkg-config file.
-PKG_CONFIG_APPEND_LIBS_RAW(${DYNAMIC_GRAPH_PLUGINDIR}/dynamic.so)
-PKG_CONFIG_APPEND_LIBRARY_DIR(${DYNAMIC_GRAPH_PLUGINDIR})
+PKG_CONFIG_APPEND_LIBS(${LIBRARY_NAME})
 
 # Search for dependencies.
 # Boost

src/CMakeLists.txt

@@ -30,7 +30,7 @@ SET(integrator-force-rk4_plugins_dependencies integrator-force)
 SET(integrator-force-exact_plugins_dependencies integrator-force)
 
 
-FOREACH(lib ${libs})
+FOREACH(lib ${plugins})
   ADD_LIBRARY(${lib} SHARED ${lib}.cpp)
 
   SET_TARGET_PROPERTIES(${lib} PROPERTIES
@@ -61,15 +61,15 @@ FOREACH(lib ${libs})
 ENDFOREACH(lib)
 
 # Main Library
-ADD_LIBRARY(dynamic SHARED dynamic.cpp)
-TARGET_LINK_LIBRARIES(dynamic jrl-dynamics)
-TARGET_LINK_LIBRARIES(dynamic sot-core)
-TARGET_LINK_LIBRARIES(dynamic dynamic-graph)
-PKG_CONFIG_USE_DEPENDENCY(dynamic jrl-dynamics)
-PKG_CONFIG_USE_DEPENDENCY(dynamic sot-core)
-PKG_CONFIG_USE_DEPENDENCY(dynamic dynamic-graph)
-
-INSTALL(TARGETS dynamic DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ADD_LIBRARY(${LIBRARY_NAME} SHARED sot-dynamic.cpp)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} jrl-dynamics)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} sot-core)
+TARGET_LINK_LIBRARIES(${LIBRARY_NAME} dynamic-graph)
+PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} jrl-dynamics)
+PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} sot-core)
+PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
+
+INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 
 # Install empty __init__.py files in intermediate directories.

src/dynamic_plugin.cpp

-/*
- * Copyright 2010,
- * François Bleibel,
- * Olivier Stasse,
- *
- * CNRS/AIST
- *
- * This file is part of sot-dynamic.
- * sot-dynamic is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- * sot-dynamic is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.  You should
- * have received a copy of the GNU Lesser General Public License along
- * with sot-dynamic.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sot-dynamic/dynamic.h>
-#include <dynamic-graph/factory.h>
-
-using namespace dynamicgraph::sot;
-using namespace dynamicgraph;
-
-DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(Dynamic,"Dynamic");

unitTesting/CMakeLists.txt

@@ -50,6 +50,7 @@ FOREACH(test ${tests})
     integrator-force
     angle-estimator
     waist-attitude-from-sensor
+    ${LIBRARY_NAME}
     )
 
   PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} jrl-dynamics)