Skip to content

Commit 1458b92

Browse files
committed
qhull is installed as libqhull in HIRONX
See start-jsk/rtmros_hironx#423 (comment) See fkanehiro#83 (comment)
1 parent 20c35b3 commit 1458b92

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

cmake_modules/FindQuickHull.cmake

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
FIND_PATH(
2-
QHULL_DIR
3-
NAMES include/qhull/qhull.h
4-
PATHS /usr /usr/local
5-
DOC "the top directory of qhull")
1+
IF (QNXNTO)
2+
FIND_PATH(
3+
QHULL_DIR
4+
NAMES include/libqhull/libqhull.h
5+
PATHS /usr /usr/local /opt/jsk
6+
DOC "the top directory of qhull")
7+
ELSE (QNXNTO)
8+
FIND_PATH(
9+
QHULL_DIR
10+
NAMES include/qhull/qhull.h
11+
PATHS /usr /usr/local
12+
DOC "the top directory of qhull")
13+
ENDIF (QNXNTO)
614

715
IF ( QHULL_DIR )
816
MESSAGE(STATUS "Found Qhull in ${QHULL_DIR}")

lib/util/BVutil.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
extern "C" {
33
#if (defined __APPLE__)
44
#include <pcl/surface/qhull.h>
5+
#elif (defined __QNX__)
6+
#include <libqhull/qhull_a.h>
57
#else
68
#include <qhull/qhull_a.h>
79
#endif

rtc/CollisionDetector/SetupCollisionPair.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
extern "C" {
1919
#if (defined __APPLE__)
2020
#include <pcl/surface/qhull.h>
21+
#elif (defined __QNX__)
22+
#include <libqhull/qhull_a.h>
2123
#else
2224
#include <qhull/qhull_a.h>
2325
#endif

rtc/CollisionDetector/vclip_1.0/src/PolyTree.C

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ using namespace Vclip;
6060
extern "C" {
6161
#if (defined __APPLE__)
6262
#include <pcl/surface/qhull.h>
63+
#elif (defined __QNX__)
64+
#include "libqhull/qhull_a.h"
6365
#else
6466
#include "qhull/qhull_a.h"
6567
#endif

0 commit comments

Comments
 (0)