Commit 1e47612e authored by olivier-stasse's avatar olivier-stasse
Browse files

Implements package name modifications from other packages.

More specifically take into account the new headers of
abstract-robot-dynamics.
parent 87972e93
......@@ -19,7 +19,7 @@ enable_testing()
# Name of the project
#--------------------
SET(PROJECT_NAME walkGenJrl)
SET(PROJECT_NAME jrl-walkgen)
SET(PROJECT_CONTACT olivier.stasse@aist.go.jp)
SET(PROJECT_DESCRIPTION "Humanoid Walking Pattern Generator (JRL)")
......@@ -76,11 +76,11 @@ INCLUDE(FindPkgConfig)
# Look for abstract robot dynamics.
SET(ABSTRACTROBOTDYNAMICS_REQUIRED_VERSION 1.15)
pkg_check_modules(ABSTRACTROBOTDYNAMICS REQUIRED abstractRobotDynamics>=${ABSTRACTROBOTDYNAMICS_REQUIRED_VERSION})
pkg_check_modules(ABSTRACTROBOTDYNAMICS REQUIRED abstract-robot-dynamics>=${ABSTRACTROBOTDYNAMICS_REQUIRED_VERSION})
SET(PROJECT_REQUIREMENTS "abstractRobotDynamics >= ${ABSTRACTROBOTDYNAMICS_REQUIRED_VERSION}")
EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir abstractRobotDynamics
OUTPUT_VARIABLE _abstractRobotDynamics_DOCDIR)
EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=docdir abstract-robot-dynamics
OUTPUT_VARIABLE _abstract-robot-dynamics_DOCDIR)
SET(${PROJECT_NAME}_src_CXXFLAGS "${${PROJECT_NAME}_src_CXXFLAGS} -I${${PROJECT_NAME}_SOURCE_DIR}")
......
......@@ -15,7 +15,7 @@
SET(BUILD_DIR ${CMAKE_BINARY_DIR}/doc)
SET(DOCDIR share/doc/${PROJECT_NAME})
SET(DOCDIR share/doc/jrl/walkgen)
SET(HTMLDIR ${DOCDIR}/html)
# Add `doc' target.
......
......@@ -35,7 +35,7 @@
#define _PATTERN_GENERATOR_INTERFACE_H_
#include <deque>
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
#include <jrl/walkgen/pgtypes.hh>
namespace PatternGeneratorJRL
......
......@@ -107,7 +107,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME_LIB}
# -------------------------
SET(${PROJECT_NAME}_src_CXXFLAGS "-I${PROJECT_SOURCE_DIR}/include/ ${${PROJECT_NAME}_src_CXXFLAGS}")
SET(${PROJECT_NAME}_src_CXXFLAGS "-I${PROJECT_SOURCE_DIR}/src/ ${${PROJECT_NAME}_src_CXXFLAGS}")
SET(${PROJECT_NAME}_src_CXXFLAGS "-I${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME} ${${PROJECT_NAME}_src_CXXFLAGS}")
SET(${PROJECT_NAME}_src_CXXFLAGS "-I${PROJECT_SOURCE_DIR}/include/jrl/walkgen/ ${${PROJECT_NAME}_src_CXXFLAGS}")
SET(${PROJECT_NAME}_src_CXXFLAGS "${${PROJECT_NAME}_src_CXXFLAGS} -I${CMAKE_INSTALL_PREFIX}/include")
SET(${PROJECT_NAME}_src_CXXFLAGS "${${PROJECT_NAME}_src_CXXFLAGS} ${${PROJECT_NAME}_CXXFLAGS}")
SET_TARGET_PROPERTIES(${PROJECT_NAME_LIB}
......@@ -123,9 +123,13 @@ SET(${PROJECT_NAME}_HEADERS ${libwpg_headers})
# Installation
# -------------
MESSAGE(STATUS "Source directory: ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}")
INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}
DESTINATION include/
FILES_MATCHING PATTERN "*.h" )
#INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
# DESTINATION include/jrl/walkgen
# PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/include/jrl/walkgen
DESTINATION include/jrl/walkgen
FILES_MATCHING PATTERN "*.hh" )
IF(UNIX)
......
......@@ -39,7 +39,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
/* dynamics JRL Japan related inclusions */
#include <abstract-robot-dynamics/jrlFoot.h>
#include <abstract-robot-dynamics/jrlfoot.hh>
/* Walking pattern generation related inclusions */
......
......@@ -33,7 +33,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
/* abstractRobotDynamics inclusion */
#include <abstract-robot-dynamics/jrlFoot.h>
#include <abstract-robot-dynamics/jrlfoot.hh>
/* Walking Pattern Generator inclusion */
......
......@@ -33,7 +33,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
// Dynamics
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
// PG
......
......@@ -38,7 +38,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
#include <jrl/walkgen/pgtypes.hh>
......
......@@ -39,7 +39,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
#include <jrl/walkgen/pgtypes.hh>
......
......@@ -29,7 +29,7 @@
#ifndef _COM_AND_FOOT_REALIZATION_H_
#define _COM_AND_FOOT_REALIZATION_H_
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
#include <SimplePlugin.h>
#include <StepStackHandler.h>
......
......@@ -44,7 +44,7 @@
#include <jrl/mal/matrixabstractlayer.hh>
/*! Abstract Interface for dynamic robot. */
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
/*! Humanoid Walking Pattern Generator */
......
......@@ -41,7 +41,7 @@
/*! Framework includes */
#include <jrl/walkgen/pgtypes.hh>
#include <abstract-robot-dynamics/jrlJoint.h>
#include <abstract-robot-dynamics/jrljoint.hh>
namespace PatternGeneratorJRL
{
......
......@@ -45,7 +45,7 @@
using namespace::std;
/*! Abstract robot dynamics includes */
#include <abstract-robot-dynamics/jrlHumanoidDynamicRobot.h>
#include <abstract-robot-dynamics/jrlhumanoiddynamicrobot.hh>
/*! Framework includes */
#include <Mathematics/PolynomeFoot.h>
......
......@@ -58,13 +58,13 @@ MESSAGE(STATUS "UL: ${${PROJECT_NAME}_test_LDFLAGS} ${${PROJECT_NAME}_test_CXXF
# Deal with dynamicsJRLJapan #
##############################
SET(_dynamicsJRLJapan_FOUND 0)
SET(_dynamicsJRLJapan_OPTIONAL "dynamicsJRLJapan >= 1.19.1")
SET(_dynamicsJRLJapan_OPTIONAL "jrl-dynamics >= 1.19.1")
PKG_CHECK_MODULES(_dynamicsJRLJapan ${_dynamicsJRLJapan_OPTIONAL})
IF(NOT _dynamicsJRLJapan_FOUND)
MESSAGE(WARNING "Check that package dynamicsJRLJapan is installed in a directory pointed out by PKG_CONFIG_PATH.")
MESSAGE(WARNING "Check that package jrl-dynamics is installed in a directory pointed out by PKG_CONFIG_PATH.")
ELSE(NOT _dynamicsJRLJapan_FOUND)
EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=datarootdir dynamicsJRLJapan
EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS --variable=datarootdir jrl-dynamics
OUTPUT_VARIABLE _dynamicsJRLJapan_DATADIR)
IF(NOT _hrp2Dynamics_FOUND)
......@@ -149,10 +149,10 @@ SET_TARGET_PROPERTIES( TestMorisawa2007
target_link_libraries (TestMorisawa2007 ${PROJECT_NAME})
ADD_DEPENDENCIES (TestMorisawa2007 ${PROJECT_NAME})
set (samplemodelpath ${_dynamicsJRLJapan_DATADIR}/examples/dynamicsJRLJapan/data/ )
set (samplespec ${_dynamicsJRLJapan_DATADIR}/examples/dynamicsJRLJapan/data/sampleSpecificities.xml)
set (sampleljr ${_dynamicsJRLJapan_DATADIR}/examples/dynamicsJRLJapan/data/sampleLinkJointRank.xml)
set (sampleinitconfig ${_dynamicsJRLJapan_DATADIR}/examples/dynamicsJRLJapan/data/sampleInitConfig.dat)
set (samplemodelpath ${_dynamicsJRLJapan_DATADIR}/examples/jrl/dynamics/data/ )
set (samplespec ${_dynamicsJRLJapan_DATADIR}/examples/jrl/dynamics/data/sampleSpecificities.xml)
set (sampleljr ${_dynamicsJRLJapan_DATADIR}/examples/jrl/dynamics/data/sampleLinkJointRank.xml)
set (sampleinitconfig ${_dynamicsJRLJapan_DATADIR}/examples/jrl/dynamics/data/sampleInitConfig.dat)
MESSAGE(STATUS "Sample specificities:" ${samplespec})
MESSAGE(STATUS "Sample link joint rank:" ${sampleljr})
......@@ -197,6 +197,6 @@ SET(${PROJECT_NAME}_EXAMPLES
)
INSTALL(FILES ${${PROJECT_NAME}_EXAMPLES}
DESTINATION share/examples/${PROJECT_NAME}/
DESTINATION share/examples/jrl/walkgen/
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE )
Supports Markdown
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