From 148a5227dd2e43c0214a45608f732638fe5cbfb0 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@laas.fr>
Date: Sat, 3 Mar 2012 11:58:35 +0100
Subject: [PATCH] [libmove3d] Fix the PLIST and pass the right boost flags to
cmake
---
libmove3d/Makefile | 3 +++
libmove3d/PLIST | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/libmove3d/Makefile b/libmove3d/Makefile
index 3ea853e4..1ed5a546 100644
--- a/libmove3d/Makefile
+++ b/libmove3d/Makefile
@@ -22,6 +22,9 @@ CMAKE_ARGS+=\
CMAKE_ARGS+=\
-DGLIB_INCLUDE_DIR=$(dir $(filter %/glib.h,${SYSTEM_FILES.glib2}))
+CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
+CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
+
# Dependencies
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
diff --git a/libmove3d/PLIST b/libmove3d/PLIST
index 8f7c6494..6080908f 100644
--- a/libmove3d/PLIST
+++ b/libmove3d/PLIST
@@ -1,4 +1,4 @@
-@comment Mon Nov 7 13:32:54 CET 2011
+@comment Sat Mar 3 11:37:55 CET 2012
include/libmove3d/animation/proto/anim_charac_traj_interface_proto.h
include/libmove3d/animation/proto/anim_charac_traj_proto.h
include/libmove3d/animation/proto/anim_compute_path_interface_proto.h
@@ -230,9 +230,12 @@ include/libmove3d/lightPlanner/proto/DlrParser.h
include/libmove3d/lightPlanner/proto/DlrPlan.h
include/libmove3d/lightPlanner/proto/DlrPlanner.h
include/libmove3d/lightPlanner/proto/Manipulation.h
+include/libmove3d/lightPlanner/proto/ManipulationArmData.hpp
include/libmove3d/lightPlanner/proto/ManipulationConfigs.hpp
+include/libmove3d/lightPlanner/proto/ManipulationData.hpp
include/libmove3d/lightPlanner/proto/ManipulationDynamic.hpp
include/libmove3d/lightPlanner/proto/ManipulationPlanner.hpp
+include/libmove3d/lightPlanner/proto/ManipulationStruct.hpp
include/libmove3d/lightPlanner/proto/ManipulationTestFunctions.hpp
include/libmove3d/lightPlanner/proto/ManipulationUtils.hpp
include/libmove3d/lightPlanner/proto/ManipulationViaConfPlanner.hpp
@@ -369,3 +372,8 @@ include/libmove3d/util/proto/util_proto.h
include/libmove3d/util/vector3d.h
lib/libmove3d.so
lib/pkgconfig/libmove3d.pc
+@pkgdir include/libmove3d/localpath/flat/src
+@pkgdir include/libmove3d/groundHeight/doc/figures
+@pkgdir include/libmove3d/graphic/shaders
+@pkgdir include/libmove3d/collision/Vcollide/doc
+@pkgdir include/libmove3d/collision/Vcollide/RAPID
--
GitLab