Commit bcaee45d authored by florent's avatar florent

Add dependency to jrl-mal

    * CMakeLists.txt,
    * include/dynamic-graph/linear-algebra.h,
    * src/CMakeLists.txt.

    For homogeneity, we use jrl-mal for matrices and vectors.
parent a40852bb
......@@ -31,6 +31,9 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SETUP_PROJECT()
# Trigger dependency to jrl-mal
ADD_REQUIRED_DEPENDENCY("jrl-mal >= 1.8.0")
# Add configuration headers for plug-ins.
GENERATE_CONFIGURATION_HEADER(
${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS)
......
......@@ -18,11 +18,12 @@
#ifndef DYNAMIC_GRAPH_LINEAR_ALGEBRA_H
#define DYNAMIC_GRAPH_LINEAR_ALGEBRA_H
#include <boost/numeric/ublas/vector.hpp>
#include <jrl/mal/boost.hh>
#include <boost/numeric/ublas/matrix.hpp>
namespace dynamicgraph {
typedef ::boost::numeric::ublas::vector<double> Vector;
typedef ::boost::numeric::ublas::matrix<double> Matrix;
typedef maal::boost::Vector Vector;
typedef maal::boost::Matrix Matrix;
}
#endif //DYNAMIC_GRAPH_LINEAR_ALGEBRA_H
......
......@@ -54,6 +54,8 @@ ADD_LIBRARY(${LIBRARY_NAME}
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} jrl-mal)
IF (UNIX)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} dl pthread)
ENDIF (UNIX)
......
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