Unverified Commit 92b273e4 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #22 from nim65s/devel

Fix details in last release
parents b1e25510 1039b0cb
......@@ -43,7 +43,29 @@ IF(BUILD_PYTHON_INTERFACE)
PKG_CONFIG_REQUIRES dynamic-graph-python)
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(include/${CUSTOM_HEADER_DIR})
# Main Library
SET(${PROJECT_NAME}_HEADERS
include/${CUSTOM_HEADER_DIR}/next-step.h
include/${CUSTOM_HEADER_DIR}/exception-pg.h
include/${CUSTOM_HEADER_DIR}/next-step-pg-sot.h
include/${CUSTOM_HEADER_DIR}/pg.h
include/${CUSTOM_HEADER_DIR}/pg-manager.h
include/${CUSTOM_HEADER_DIR}/step-queue.h
include/${CUSTOM_HEADER_DIR}/selector.h
include/${CUSTOM_HEADER_DIR}/step-checker.h
include/${CUSTOM_HEADER_DIR}/step-time-line.h
include/${CUSTOM_HEADER_DIR}/step-observer.h
include/${CUSTOM_HEADER_DIR}/step-computer.h
include/${CUSTOM_HEADER_DIR}/step-computer-force.h
include/${CUSTOM_HEADER_DIR}/step-computer-joystick.h
include/${CUSTOM_HEADER_DIR}/step-computer-pos.h
include/${CUSTOM_HEADER_DIR}/which-foot-upper.h
)
ADD_LIBRARY(${PROJECT_NAME} INTERFACE)
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
ADD_SUBDIRECTORY(src)
IF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(python)
......
# Copyright 2010, François Bleibel, Olivier Stasse, JRL, CNRS/AIST
#
SET(${PROJECT_NAME}_HEADERS
next-step.h
exception-pg.h
next-step-pg-sot.h
pg.h
pg-manager.h
step-queue.h
selector.h
step-checker.h
step-time-line.h
step-observer.h
step-computer.h
step-computer-force.h
step-computer-joystick.h
step-computer-pos.h
which-foot-upper.h
)
IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
INSTALL(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${CUSTOM_HEADER_DIR})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
#
# Copyright
#
SET(EXECUTABLE_NAME test${PROJECT_NAME})
ADD_DEFINITIONS(-DDEBUG=2)
ADD_EXECUTABLE(${EXECUTABLE_NAME}
main.cc)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/src)
SET(EXECUTABLE_DEPENDENCIES
next-step
next-step-pg-sot
step-checker
step-computer-joystick
step-observer
step-queue
step-time-line
which-foot-upper
pg
pg-manager
)
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} ${EXECUTABLE_DEPENDENCIES})
ADD_DEPENDENCIES(${EXECUTABLE_NAME} ${EXECUTABLE_DEPENDENCIES})
ADD_TEST(main_test ${EXECUTABLE_NAME})
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} pinocchio)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} jrl-walkgen)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} sot-core)
PKG_CONFIG_USE_DEPENDENCY(${EXECUTABLE_NAME} dynamic-graph)
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