Skip to content

Commit

Permalink
[path/hpp-fcl] disable qhull on 16.04 & stretch
Browse files Browse the repository at this point in the history
As they have an old version without qhull_r, which is required by hpp-fcl
  • Loading branch information
nim65s committed Jun 24, 2021
1 parent 043c441 commit 893ceb5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 6 additions & 2 deletions path/hpp-fcl/Makefile
Expand Up @@ -19,15 +19,19 @@ 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
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
1 change: 0 additions & 1 deletion path/py-hpp-fcl/Makefile
Expand Up @@ -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

0 comments on commit 893ceb5

Please sign in to comment.