Merge pull request #136 from v4hn/octomap-safeguards

add safe-guards to allow octree headers only if octomap enabled
flexible-collision-library · Jun 26, 2016 · dd0dce5 · dd0dce5
2 parents 9755ce0 + 657795c
commit dd0dce5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/include/fcl/octree.h b/include/fcl/octree.h
@@ -39,6 +39,10 @@
 #ifndef FCL_OCTREE_H
 #define FCL_OCTREE_H
 
+#include "fcl/config.h"
+#if not(FCL_HAVE_OCTOMAP)
+#error "This header requires fcl to be compiled with octomap support"
+#endif
 
 #include <memory>
 #include <array>

diff --git a/include/fcl/traversal/traversal_node_octree.h b/include/fcl/traversal/traversal_node_octree.h
@@ -38,6 +38,11 @@
 #ifndef FCL_TRAVERSAL_NODE_OCTREE_H
 #define FCL_TRAVERSAL_NODE_OCTREE_H
 
+#include "fcl/config.h"
+#if not(FCL_HAVE_OCTOMAP)
+#error "This header requires fcl to be compiled with octomap support"
+#endif
+
 #include "fcl/collision_data.h"
 #include "fcl/traversal/traversal_node_base.h"
 #include "fcl/narrowphase/narrowphase.h"