forked from start-jsk/hrpsys
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Benjamin Chrétien
committed
Mar 9, 2014
1 parent
f160f21
commit cf31247
Showing
2 changed files
with
66 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
Index: cmake_modules/FindQuickHull.cmake | ||
=================================================================== | ||
--- cmake_modules/FindQuickHull.cmake | ||
+++ cmake_modules/FindQuickHull.cmake | ||
@@ -1,6 +1,6 @@ | ||
FIND_PATH( | ||
QHULL_DIR | ||
-NAMES include/qhull/qhull.h | ||
+NAMES include/libqhull/libqhull.h | ||
PATHS /usr /usr/local | ||
DOC "the top directory of qhull") | ||
|
||
Index: lib/util/BVutil.cpp | ||
=================================================================== | ||
--- lib/util/BVutil.cpp | ||
+++ 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" | ||
Index: rtc/CollisionDetector/SetupCollisionPair.cpp | ||
=================================================================== | ||
--- rtc/CollisionDetector/SetupCollisionPair.cpp | ||
+++ 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) | ||
Index: rtc/CollisionDetector/vclip_1.0/src/PolyTree.C | ||
=================================================================== | ||
--- rtc/CollisionDetector/vclip_1.0/src/PolyTree.C | ||
+++ rtc/CollisionDetector/vclip_1.0/src/PolyTree.C | ||
@@ -58,7 +58,7 @@ | ||
|
||
#if QHULL | ||
extern "C" { | ||
-#include "qhull/qhull_a.h" | ||
+#include "libqhull/qhull_a.h" | ||
} | ||
//char qh_version[] = "vclip 1.0"; | ||
#endif |