qhull is installed as libqhull in HIRONX

See start-jsk/rtmros_hironx#423 (comment) See fkanehiro#83 (comment)
pazeshun · Nov 13, 2019 · 9e9c5d3 · 9e9c5d3
1 parent 20c35b3
commit 9e9c5d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cmake_modules/FindQuickHull.cmake b/cmake_modules/FindQuickHull.cmake
@@ -1,7 +1,9 @@
 FIND_PATH(
 QHULL_DIR
-NAMES include/qhull/qhull.h
-PATHS /usr /usr/local
+# NAMES include/qhull/qhull.h
+# PATHS /usr /usr/local
+NAMES include/libqhull/libqhull.h
+PATHS /usr /usr/local /opt/jsk
 DOC "the top directory of qhull")
 
 IF ( QHULL_DIR )

diff --git a/lib/util/BVutil.cpp b/lib/util/BVutil.cpp
@@ -3,7 +3,7 @@ extern "C" {
 #if (defined __APPLE__)
 #include <pcl/surface/qhull.h>
 #else
-#include <qhull/qhull_a.h>
+#include <libqhull/qhull_a.h>
 #endif
 }
 #include <hrpModel/Link.h>

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

diff --git a/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C b/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C
@@ -61,7 +61,7 @@ extern "C" {
 #if (defined __APPLE__)
 #include <pcl/surface/qhull.h>
 #else
-#include "qhull/qhull_a.h"
+#include "libqhull/qhull_a.h"
 #endif
 }
 //char qh_version[] = "vclip 1.0";