From 893ceb5ee752755e29bd4f8c37a25a1895a6b91b Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 24 Jun 2021 15:01:54 +0200 Subject: [PATCH] [path/hpp-fcl] disable qhull on 16.04 & stretch As they have an old version without qhull_r, which is required by hpp-fcl --- path/hpp-fcl/Makefile | 8 ++++++-- path/py-hpp-fcl/Makefile | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/path/hpp-fcl/Makefile b/path/hpp-fcl/Makefile index 02daa048a..c128b5e6b 100644 --- a/path/hpp-fcl/Makefile +++ b/path/hpp-fcl/Makefile @@ -19,7 +19,12 @@ USE_BOOST_LIBS= thread date_time system filesystem unit_test_framework chrono # boost-1.47.0 has -Wconversion warnings in date_time/posix_time/posix_time.hpp CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF -CMAKE_ARGS+= -DHPP_FCL_HAS_QHULL=ON + +include ../../mk/robotpkg.prefs.mk +ifeq (,$(filter Ubuntu-16.04 Debian-9,${OPSYS}-${OS_VERSION})) + CMAKE_ARGS+= -DHPP_FCL_HAS_QHULL=ON + include ../../mk/sysdep/qhull.mk +endif include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk @@ -27,7 +32,6 @@ include ../../mapping/octomap/depend.mk include ../../math/eigen3/depend.mk include ../../math/libccd/depend.mk include ../../graphics/assimp/depend.mk -include ../../mk/sysdep/qhull.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/path/py-hpp-fcl/Makefile b/path/py-hpp-fcl/Makefile index b2341fc86..d9d8a3710 100644 --- a/path/py-hpp-fcl/Makefile +++ b/path/py-hpp-fcl/Makefile @@ -26,7 +26,6 @@ include ../../path/hpp-fcl/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../mk/sysdep/cmake.mk include ../../mk/sysdep/python.mk -include ../../mk/sysdep/qhull.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk