Commit 08ec9b4a authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Fix Makefile

  wrong cache variable name HPP_MANIPULATION_HAS_WHOLEBODY_STEP,
  express dependency of hpp-manipulation-corba to hpp-template-corba when
  hpp-wholebody-step-corba is not installed.
parent 200cf848
......@@ -160,11 +160,11 @@ roboptim-trajectory-3.1_extra_flags= -DCMAKE_BUILD_TYPE=Release -DCXX_DISABLE_WE
qpOASES_extra_flags= -DCMAKE_BUILD_TYPE=Release
ifeq (${HUMANOID}, TRUE)
hpp-manipulation_extra_flags= -DHPP_MANIPULATION_HAS_WHOLEBODY=TRUE
hpp-manipulation-corba_extra_flags-DHPP_MANIPULATION_HAS_WHOLEBODY=TRUE
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=TRUE
else
hpp-manipulation_extra_flags= -DHPP_MANIPULATION_HAS_WHOLEBODY=FALSE
hpp-manipulation-corba_extra_flags-DHPP_MANIPULATION_HAS_WHOLEBODY=FALSE
hpp-manipulation_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
hpp-manipulation-corba_extra_flags=-DHPP_MANIPULATION_HAS_WHOLEBODY_STEP=FALSE
endif
all: hpp_tutorial.install \
......@@ -206,7 +206,7 @@ else
hpp-manipulation.configure.dep: hpp-core.install hpp-constraints.install \
hpp-manipulation.checkout
hpp-manipulation-corba.configure.dep: hpp-manipulation-urdf.install \
hpp-manipulation.install \
hpp-manipulation.install hpp-template-corba.install \
hpp-manipulation-corba.checkout
endif
hpp-manipulation-urdf.configure.dep:hpp-manipulation.install \
......
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