...
 
Commits (7)
...@@ -24,10 +24,12 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) ...@@ -24,10 +24,12 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
# jrl-cmakemodules handling of usual modules # jrl-cmakemodules handling of usual modules
INCLUDE(cmake/pthread.cmake) INCLUDE(cmake/pthread.cmake)
add_project_dependency(Eigen3 REQUIRED NO_MODULE) INCLUDE(cmake/boost.cmake)
add_project_dependency(Boost REQUIRED
OPTIONAL_COMPONENTS ADD_REQUIRED_DEPENDENCY(eigen3)
serialization system unit_test_framework thread) SET(BOOST_COMPONENTS serialization system unit_test_framework thread)
SEARCH_FOR_BOOST()
# Allows math in mathjax. # Allows math in mathjax.
SET(DOXYGEN_USE_MATHJAX YES) SET(DOXYGEN_USE_MATHJAX YES)
...@@ -63,19 +65,12 @@ SEARCH_FOR_PTHREAD() ...@@ -63,19 +65,12 @@ SEARCH_FOR_PTHREAD()
#################################### ####################################
### Main Library ### Main Library
#################################### ####################################
SET(LIBRARY_NAME ${PROJECT_NAME})
# Verbosity level # Verbosity level
IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG) ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
# Declare boost include directories SET(${PROJECT_NAME}_SOURCES
#include_directories(${Boost_INCLUDE_DIRS})
#link_directories(${Boost_LIBRARY_DIRS})
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
src/debug/debug.cpp src/debug/debug.cpp
src/debug/real-time-logger.cpp src/debug/real-time-logger.cpp
src/debug/logger.cpp src/debug/logger.cpp
...@@ -97,7 +92,6 @@ ADD_LIBRARY(${LIBRARY_NAME} ...@@ -97,7 +92,6 @@ ADD_LIBRARY(${LIBRARY_NAME}
src/command/value.cpp src/command/value.cpp
src/command/command.cpp src/command/command.cpp
) )
SET(${PROJECT_NAME}_HEADERS SET(${PROJECT_NAME}_HEADERS
...@@ -150,7 +144,10 @@ SET(${PROJECT_NAME}_HEADERS ...@@ -150,7 +144,10 @@ SET(${PROJECT_NAME}_HEADERS
include/dynamic-graph/all-commands.h include/dynamic-graph/all-commands.h
include/dynamic-graph/logger.h include/dynamic-graph/logger.h
) )
ADD_LIBRARY(${PROJECT_NAME}
SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS}) SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
...@@ -168,18 +165,18 @@ target_include_directories(${PROJECT_NAME} ...@@ -168,18 +165,18 @@ target_include_directories(${PROJECT_NAME}
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_BUILD_DIR}/include> $<BUILD_INTERFACE:${CMAKE_BUILD_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<BUILD_INTERFACE:${EIGEN3_INCLUDE_DIR}> $<BUILD_INTERFACE:${EIGEN3_INCLUDE_DIRS}>
INTERFACE ${EIGEN3_INCLUDE_DIR} INTERFACE ${EIGEN3_INCLUDE_DIRS}
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
IF (UNIX) IF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CMAKE_DL_LIBS} pthread) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${CMAKE_DL_LIBS} pthread)
ENDIF (UNIX) ENDIF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES})
#################################### ####################################
### Plugins ### Plugins
...@@ -187,7 +184,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES}) ...@@ -187,7 +184,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
SET(plugins_list SET(plugins_list
src/traces/tracer src/traces/tracer
src/traces/tracer-real-time src/traces/tracer-real-time
) )
SET(tracer-real-time_dependency tracer) SET(tracer-real-time_dependency tracer)
...@@ -209,7 +206,6 @@ FOREACH(plugin_file ${plugins_list}) ...@@ -209,7 +206,6 @@ FOREACH(plugin_file ${plugins_list})
DESTINATION ${PLUGINDIR}) DESTINATION ${PLUGINDIR})
ENDFOREACH(plugin_file) ENDFOREACH(plugin_file)
ADD_SUBDIRECTORY(include/${PROJECT_NAME})
ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(tests)
get_cmake_property(_variableNames VARIABLES) get_cmake_property(_variableNames VARIABLES)
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP #ifndef DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP
#define DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP #define DYNAMIC_GRAPH_COMMAND_GETTER_T_CPP
#include "dynamic-graph/command-getter.h"
#include <sstream> #include <sstream>
namespace dynamicgraph { namespace dynamicgraph {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define DYNAMIC_GRAPH_COMMAND_SETTER_T_CPP #define DYNAMIC_GRAPH_COMMAND_SETTER_T_CPP
#include "dynamic-graph/linear-algebra.h" #include "dynamic-graph/linear-algebra.h"
#include "dynamic-graph/command-setter.h"
#include <boost/assign/list_of.hpp> #include <boost/assign/list_of.hpp>
#include <sstream> #include <sstream>
......
<package format="2"> <package format="2">
<name>dynamic-graph</name> <name>dynamic-graph</name>
<version>3.8.0</version> <version>3.8.1</version>
<description> <description>
Dynamic graph library Dynamic graph library
</description> </description>
......