Skip to content

Commit

Permalink
[CMake] don't require dg-python if we don't build python interface
Browse files Browse the repository at this point in the history
while here, clean include
  • Loading branch information
nim65s committed Sep 17, 2019
1 parent 3792eaa commit abbadc9
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 43 deletions.
10 changes: 7 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ SETUP_PROJECT()
ADD_REQUIRED_DEPENDENCY("jrl-walkgen >= 3.2.0")
ADD_REQUIRED_DEPENDENCY("pinocchio >= 1.2.0")
ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
ADD_REQUIRED_DEPENDENCY("sot-core >= 3.0")
ADD_OPTIONAL_DEPENDENCY("hrp2_14_description >= 1.0.5")
ADD_OPTIONAL_DEPENDENCY("talos_data")
Expand All @@ -44,11 +43,16 @@ IF(BUILD_PYTHON_INTERFACE)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python")
SET(PYTHON_LOCAL_PATH "sot/pattern_generator")
ADD_REQUIRED_DEPENDENCY("dynamic-graph-python >= 3.0.0")
ENDIF(BUILD_PYTHON_INTERFACE)

ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(python)
IF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
ADD_SUBDIRECTORY(include/${PROJECT_NAME})
ENDIF(NOT INSTALL_PYTHON_INTERFACE_ONLY)
IF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(python)
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_SUBDIRECTORY(unitTesting)

SETUP_PROJECT_FINALIZE()
40 changes: 0 additions & 40 deletions include/CMakeLists.txt

This file was deleted.

22 changes: 22 additions & 0 deletions include/sot-pattern-generator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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
)

INSTALL(FILES ${${PROJECT_NAME}_HEADERS} DESTINATION include/${PROJECT_NAME})

0 comments on commit abbadc9

Please sign in to comment.