From b02f78d4a0f54910af7848f51f66c2fc00fd7de3 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@laas.fr>
Date: Wed, 21 Dec 2011 16:01:47 +0100
Subject: [PATCH] [wip/jafar-rtslam] Try to fix the build
Some dependencies are required by the package but were marked as
optional
FindBoost.cmake is a mess, it detects correctly boost_libs with
BOOST_ROOT defined, but not with BOOST_LIBRARYDIR or any other variant,
so go with BOOST_ROOT for moment ...
---
jafar-rtslam/Makefile | 45 ++++++++++++++-----------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
diff --git a/jafar-rtslam/Makefile b/jafar-rtslam/Makefile
index 144cafed..98572985 100644
--- a/jafar-rtslam/Makefile
+++ b/jafar-rtslam/Makefile
@@ -11,9 +11,8 @@ LICENSE= isc
USE_LANGUAGES+= c c++ fortran
USE_PKGLOCALEDIR= yes
-CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
-CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
-CMAKE_ARGS+= -DCMAKE_MODULE_PATH=.
+CMAKE_ARGS+= -DBOOST_ROOT=${PREFIX.boost-headers}
+CMAKE_ARGS+= -DCMAKE_MODULE_PATH=.
# because the package generation is buggy, it declares JAFAR_NDEBUG instead
CPPFLAGS += -DJFR_NDEBUG
@@ -43,31 +42,6 @@ define PKG_OPTION_UNSET.viam
CMAKE_ARGS+= -DHAVE_VIAM=OFF
endef
-PKG_SUPPORTED_OPTIONS+= MTI
-PKG_OPTION_DESCR.MTI= Enable MTI support.
-define PKG_OPTION_SET.MTI
- CMAKE_ARGS+= -DHAVE_MTI=ON
- CPPFLAGS+= -DHAVE_MTI
- include ../../hardware/MTI/depend.mk
-endef
-define PKG_OPTION_UNSET.MTI
- CMAKE_ARGS+= -DHAVE_MTI=OFF
-endef
-
-PKG_SUPPORTED_OPTIONS+= qdisplay
-PKG_OPTION_DESCR.qdisplay = Enable jafar module qdisplay support for 2D display
-define PKG_OPTION_SET.qdisplay
- CPPFLAGS+=-DHAVE_MODULE_QDISPLAY
- include ../../wip/jafar-qdisplay/depend.mk
-endef
-
-PKG_SUPPORTED_OPTIONS+= gdhe
-PKG_OPTION_DESCR.gdhe = Enable jafar module gdhe support for 3D display
-define PKG_OPTION_SET.gdhe
- CPPFLAGS+=-DHAVE_MODULE_GDHE
- include ../../wip/jafar-gdhe/depend.mk
- include ../../graphics/gdhe/depend.mk
-endef
PKG_SUPPORTED_OPTIONS+= dseg
PKG_OPTION_DESCR.dseg= Enable jafar module dseg support for segments
@@ -76,15 +50,24 @@ define PKG_OPTION_SET.dseg
include ../../wip/jafar-dseg/depend.mk
endef
+CMAKE_ARGS+= -DHAVE_MTI=ON
+CPPFLAGS+= -DHAVE_MODULE_QDISPLAY
+CPPFLAGS+= -DHAVE_MTI
+CPPFLAGS+= -DHAVE_MODULE_GDHE
-include ../../wip/jafar-kernel/depend.mk
+DEPEND_ABI.MTI= MTI>=0.5
+
+include ../../wip/jafar-correl/depend.mk
+include ../../wip/jafar-gdhe/depend.mk
include ../../wip/jafar-image/depend.mk
include ../../wip/jafar-jmath/depend.mk
-include ../../wip/jafar-correl/depend.mk
+include ../../wip/jafar-kernel/depend.mk
+include ../../wip/jafar-qdisplay/depend.mk
+
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-
+include ../../hardware/MTI/depend.mk
include ../../pkgtools/libtool/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
--
GitLab