qhull is installed as libqhull in HIRONX

See start-jsk/rtmros_hironx#423 (comment)
pazeshun · Nov 7, 2019 · 36951c4 · 36951c4
1 parent 472fbd7
commit 36951c4
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
@@ -1,6 +1,6 @@
 #include <iostream>
 extern "C" {
-#include <qhull/qhull_a.h>
+#include <libqhull/qhull_a.h>
 }
 #include <hrpModel/Link.h>
 #include "BVutil.h"

diff --git a/rtc/CollisionDetector/SetupCollisionPair.cpp b/rtc/CollisionDetector/SetupCollisionPair.cpp
@@ -16,7 +16,7 @@
 #include <hrpCollision/ColdetModel.h>
 #include "CollisionDetector.h"
 extern "C" {
-#include <qhull/qhull_a.h>
+#include <libqhull/qhull_a.h>
 }
 
 #define deg2rad(x)	((x)*M_PI/180)

diff --git a/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C b/rtc/CollisionDetector/vclip_1.0/src/PolyTree.C
@@ -58,7 +58,7 @@ using namespace Vclip;
 
 #if QHULL
 extern "C" {
-#include "qhull/qhull_a.h"
+#include "libqhull/qhull_a.h"
 }
 //char qh_version[] = "vclip 1.0";
 #endif