qhull is installed as libqhull in HIRONX

See start-jsk/rtmros_hironx#423 (comment) See fkanehiro#83 (comment)
pazeshun · Nov 14, 2019 · 852a1de · 852a1de
1 parent 5cbb549
commit 852a1de
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/cmake_modules/FindQuickHull.cmake b/cmake_modules/FindQuickHull.cmake
@@ -1,8 +1,16 @@
-FIND_PATH(
-QHULL_DIR
-NAMES include/qhull/qhull.h
-PATHS /usr /usr/local
-DOC "the top directory of qhull")
+IF (QNXNTO)
+    FIND_PATH(
+    QHULL_DIR
+    NAMES include/libqhull/libqhull.h
+    PATHS /usr /usr/local /opt/jsk
+    DOC "the top directory of qhull")
+ELSE (QNXNTO)
+    FIND_PATH(
+    QHULL_DIR
+    NAMES include/qhull/qhull.h
+    PATHS /usr /usr/local
+    DOC "the top directory of qhull")
+ENDIF (QNXNTO)
 
 IF ( QHULL_DIR )
     MESSAGE(STATUS "Found Qhull in ${QHULL_DIR}")

diff --git a/lib/util/BVutil.cpp b/lib/util/BVutil.cpp
@@ -2,6 +2,8 @@
 extern "C" {
 #if (defined __APPLE__)
 #include <pcl/surface/qhull.h>
+#elif (defined __QNX__)
+#include <libqhull/qhull_a.h>
 #else
 #include <qhull/qhull_a.h>
 #endif

diff --git a/rtc/CollisionDetector/SetupCollisionPair.cpp b/rtc/CollisionDetector/SetupCollisionPair.cpp
@@ -18,6 +18,8 @@
 extern "C" {
 #if (defined __APPLE__)
 #include <pcl/surface/qhull.h>
+#elif (defined __QNX__)
+#include <libqhull/qhull_a.h>
 #else
 #include <qhull/qhull_a.h>
 #endif

diff --git a/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C b/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C
@@ -60,6 +60,8 @@ using namespace Vclip;
 extern "C" {
 #if (defined __APPLE__)
 #include <pcl/surface/qhull.h>
+#elif (defined __QNX__)
+#include "libqhull/qhull_a.h"
 #else
 #include "qhull/qhull_a.h"
 #endif