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

Clean up Makefile

  - install baxter_description from github,
  - add targets for Romeo,
  - remove reference to hpp-model and hpp-model-urdf.
parent 08ec9b4a
......@@ -8,6 +8,7 @@ JRL_REPO=https://github.com/jrl-umi3218
LAAS_REPO=https://github.com/laas
HPP_REPO=https://github.com/humanoid-path-planner
SOT_REPO=https://github.com/stack-of-tasks
RETHINK_ROBOTICS_REPO=https://github.com/RethinkRobotics
SRC_DIR=${DEVEL_DIR}/src
INSTALL_DIR=${DEVEL_DIR}/install
......@@ -34,9 +35,6 @@ hpp-fcl_extra_flags= -DCMAKE_BUILD_TYPE=Release
hpp-util_branch=master
hpp-util_repository=${HPP_REPO}
hpp-model_branch=master
hpp-model_repository=${HPP_REPO}
pinocchio_branch=master
pinocchio_repository=${SOT_REPO}
pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF
......@@ -44,9 +42,6 @@ pinocchio_extra_flags= -DBUILD_PYTHON_INTERFACE=OFF
hpp-pinocchio_branch=master
hpp-pinocchio_repository=${HPP_REPO}
hpp-model-urdf_branch=xxx
hpp-model-urdf_repository=${HPP_REPO}
hpp-statistics_branch=master
hpp-statistics_repository=${HPP_REPO}
......@@ -146,9 +141,18 @@ universal_robot_repository=${HPP_REPO}
hpp_universal_robot_branch=devel
hpp_universal_robot_repository=${FLORENT_REPO}
baxter_common_branch=master
baxter_repository=${RETHINK_ROBOTICS_REPO}
hpp-baxter_branch=master
hpp-baxter_repository=${HPP_REPO}
hpp_romeo_branch=master
hpp_romeo_repository=${HPP_REPO}
romeo_branch=master
romeo_repository=${HPP_REPO}
OpenSceneGraph-dae-plugin_extra_flags= -DCOLLADA_DYNAMIC_LIBRARY=${INSTALL_DIR}/lib/libcollada14dom.so -DCOLLADA_INCLUDE_DIR=${INSTALL_DIR}/include/collada-dom
collada-dom_extra_flags=-DBUILD_SHARED_LIBS=TRUE -DOPT_COLLADA15=FALSE
......@@ -202,12 +206,17 @@ hpp-manipulation.configure.dep: hpp-core.install hpp-constraints.install \
hpp-manipulation-corba.configure.dep: hpp-manipulation-urdf.install \
hpp-wholebody-step-corba.install hpp-manipulation.install \
hpp-manipulation-corba.checkout
hpp-plot.configure.dep: hpp-corbaserver.install hpp-manipulation-corba.install \
hpp-wholebody-step-corba.install qgv.install \
hpp-plot.checkout
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-template-corba.install \
hpp-manipulation-corba.checkout
hpp-plot.configure.dep: hpp-corbaserver.install hpp-manipulation-corba.install \
qgv.install hpp-plot.checkout
endif
hpp-manipulation-urdf.configure.dep:hpp-manipulation.install \
hpp-manipulation-urdf.checkout
......@@ -247,8 +256,12 @@ universal_robot.configure.dep: universal_robot.install \
hpp_universal_robot.configure.dep: universal_robot.install \
hpp_universal_robot.checkout
hpp-environments.configure.dep: hpp-environments.checkout
hpp-baxter.configure.dep: hpp-corbaserver.install hpp-baxter.checkout
baxter_common.configure.dep: baxter_common.checkout
hpp-baxter.configure.dep: hpp-corbaserver.install baxter_common.install \
hpp-baxter.checkout
pythonqt.configure.dep: pythonqt.checkout
hpp_romeo.configure.dep: romeo.install hpp_romeo.checkout
romeo.configure.dep: romeo.checkout
status:
@for child_dir in $$(ls ${SRC_DIR}); do \
......@@ -399,3 +412,33 @@ universal_robot.install_nodep:universal_robot.configure_nodep
universal_robot.install:universal_robot.configure
cd ${SRC_DIR}/$(@:.install=)/ur_description/${BUILD_FOLDER};\
make install
baxter_common.configure_nodep:
mkdir -p ${SRC_DIR}/$(@:.configure_nodep=)/baxter_description/${BUILD_FOLDER}; \
cd ${SRC_DIR}/$(@:.configure_nodep=)/baxter_description/${BUILD_FOLDER}; \
cmake -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/install -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -DNDEBUG" ${$(@:.configure_nodep=)_extra_flags} ..; \
mkdir -p ${SRC_DIR}/$(@:.configure_nodep=)/rethink_ee_description/${BUILD_FOLDER}; \
cd ${SRC_DIR}/$(@:.configure_nodep=)/rethink_ee_description/${BUILD_FOLDER}; \
cmake -DCMAKE_INSTALL_PREFIX=${DEVEL_DIR}/install -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -DNDEBUG" ${$(@:.configure_nodep=)_extra_flags} ..
baxter_common.install_nodep:baxter_common.configure_nodep
cd ${SRC_DIR}/$(@:.install_nodep=)/baxter_description/${BUILD_FOLDER};\
make install; \
cd ${SRC_DIR}/$(@:.install_nodep=)/rethink_ee_description/${BUILD_FOLDER};\
make install
baxter_common.install:baxter_common.configure
cd ${SRC_DIR}/$(@:.install=)/baxter_description/${BUILD_FOLDER};\
make install; \
cd ${SRC_DIR}/$(@:.install=)/rethink_ee_description/${BUILD_FOLDER};\
make install
romeo.configure: romeo.configure.dep
. ${INSTALL_DIR}/setup.sh; \
cd ${SRC_DIR}/romeo/romeo_description;\
mkdir -p ${BUILD_FOLDER}; \
cd ${SRC_DIR}/romeo/romeo_description/${BUILD_FOLDER}; \
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
romeo.install: romeo.configure
${MAKE} -C ${SRC_DIR}/romeo/romeo_description/${BUILD_FOLDER} 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