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