diff --git a/CMakeLists.txt b/CMakeLists.txt index bc18907e6f10de0dceb76753fd77df7cfdd4ea15..feffe755e912e9b574e3bf772360bc3ba47aaa94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,97 +75,6 @@ OPTION(USE_DYNAMICS_JRL_JAPAN "Compile with dynamicsJRLJapan" ON) INCLUDE(FindPkgConfig) SET(PACKAGE_REQUIREMENTS "") -# -# Dependency to package MatrixAbstractLayer -# -SET(_MatrixAbstractLayer_FOUND 0) -SET(_MatrixAbstractLayer_REQUIRED "MatrixAbstractLayer >= 1.0") -PKG_CHECK_MODULES(_MatrixAbstractLayer REQUIRED ${_MatrixAbstractLayer_REQUIRED}) -EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir MatrixAbstractLayer - OUTPUT_VARIABLE _MatrixAbstractLayer_DOCDIR) -MESSAGE(STATUS "pkg-config: ${PKG_CONFIG_EXECUTABLE}") -MESSAGE(STATUS "_MatrixAbstractLayer_DOCDIR=${_MatrixAbstractLayer_DOCDIR}") -SET(_MatrixAbstractLayer_FOUND 1) - -IF(NOT ${_MatrixAbstractLayer_FOUND}) - MESSAGE(FATAL_ERROR "Check that package MatrixAbstractLayer is installed in a directory pointed out by PKG_CONFIG_PATH.") -ENDIF(NOT ${_MatrixAbstractLayer_FOUND}) - -IF(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS ${_MatrixAbstractLayer_REQUIRED}) -ELSE(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${_MatrixAbstractLayer_REQUIRED}") -ENDIF(PACKAGE_REQUIREMENTS STREQUAL "") - - -# -# Dependency to package dynamicsJRLJapan -# -SET(_dynamicsJRLJapan_FOUND 0) -SET(_dynamicsJRLJapan_REQUIRED "dynamicsJRLJapan >= 1.0") -PKG_CHECK_MODULES(_dynamicsJRLJapan REQUIRED ${_dynamicsJRLJapan_REQUIRED}) -EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir dynamicsJRLJapan - OUTPUT_VARIABLE _dynamicsJRLJapan_DOCDIR) -MESSAGE(STATUS "pkg-config: ${PKG_CONFIG_EXECUTABLE}") -MESSAGE(STATUS "_dynamicsJRLJapan_DOCDIR=${_dynamicsJRLJapan_DOCDIR}") -SET(_dynamicsJRLJapan_FOUND 1) - -IF(NOT ${_dynamicsJRLJapan_FOUND}) - MESSAGE(FATAL_ERROR "Check that package dynamicsJRLJapan is installed in a directory pointed out by PKG_CONFIG_PATH.") -ENDIF(NOT ${_dynamicsJRLJapan_FOUND}) - -IF(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS ${_dynamicsJRLJapan_REQUIRED}) -ELSE(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${_dynamicsJRLJapan_REQUIRED}") -ENDIF(PACKAGE_REQUIREMENTS STREQUAL "") - - -# -# Dependency to package hrp2Dynamics -# -SET(_hrp2Dynamics_FOUND 0) -SET(_hrp2Dynamics_REQUIRED "hrp2Dynamics >= 1.0") -PKG_CHECK_MODULES(_hrp2Dynamics REQUIRED ${_hrp2Dynamics_REQUIRED}) -EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir hrp2Dynamics - OUTPUT_VARIABLE _hrp2Dynamics_DOCDIR) -MESSAGE(STATUS "pkg-config: ${PKG_CONFIG_EXECUTABLE}") -MESSAGE(STATUS "_hrp2Dynamics_DOCDIR=${_hrp2Dynamics_DOCDIR}") -SET(_hrp2Dynamics_FOUND 1) - -IF(NOT ${_hrp2Dynamics_FOUND}) - MESSAGE(FATAL_ERROR "Check that package hrp2Dynamics is installed in a directory pointed out by PKG_CONFIG_PATH.") -ENDIF(NOT ${_hrp2Dynamics_FOUND}) - -IF(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS ${_hrp2Dynamics_REQUIRED}) -ELSE(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${_hrp2Dynamics_REQUIRED}") -ENDIF(PACKAGE_REQUIREMENTS STREQUAL "") - - -# -# Dependency to package walkGenJrl -# -SET(_walkGenJrl_FOUND 0) -SET(_walkGenJrl_REQUIRED "walkGenJrl >= 1.0") -PKG_CHECK_MODULES(_walkGenJrl REQUIRED ${_walkGenJrl_REQUIRED}) -EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir walkGenJrl - OUTPUT_VARIABLE _walkGenJrl_DOCDIR) -MESSAGE(STATUS "pkg-config: ${PKG_CONFIG_EXECUTABLE}") -MESSAGE(STATUS "_walkGenJrl_DOCDIR=${_walkGenJrl_DOCDIR}") -SET(_walkGenJrl_FOUND 1) - -IF(NOT ${_walkGenJrl_FOUND}) - MESSAGE(FATAL_ERROR "Check that package walkGenJrl is installed in a directory pointed out by PKG_CONFIG_PATH.") -ENDIF(NOT ${_walkGenJrl_FOUND}) - -IF(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS ${_walkGenJrl_REQUIRED}) -ELSE(PACKAGE_REQUIREMENTS STREQUAL "") - SET(PACKAGE_REQUIREMENTS "${PACKAGE_REQUIREMENTS}, ${_walkGenJrl_REQUIRED}") -ENDIF(PACKAGE_REQUIREMENTS STREQUAL "") - # # pkg-config file # diff --git a/src/dgraph/shell-functions.cpp b/src/dgraph/shell-functions.cpp index 0a4a9f1071612e93b149e89b84cfbd4eb01f6797..f75bb24edd80be876e7a014f8add1ee57f5aa77f 100644 --- a/src/dgraph/shell-functions.cpp +++ b/src/dgraph/shell-functions.cpp @@ -25,8 +25,6 @@ #include <dynamicGraph/signal.h> #include <dynamicGraph/exception-signal.h> -#include <MatrixAbstractLayer/boost.h> - #ifdef WIN32 #include <Windows.h> #endif diff --git a/src/dgraph/shell-procedure.cpp b/src/dgraph/shell-procedure.cpp index 96d8f38c2552da051de9df5d32868c0f8df193f4..771d37246af72cc369714f6d481f4dc7ceb5768d 100644 --- a/src/dgraph/shell-procedure.cpp +++ b/src/dgraph/shell-procedure.cpp @@ -23,8 +23,6 @@ #include <dynamicGraph/debug.h> #include <dynamicGraph/entity.h> -#include <MatrixAbstractLayer/boost.h> - #include <fstream> using namespace std; using namespace dynamicgraph;