Commit c20533b4 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Move headers from include/fcl to include/hpp/fcl

  This enables users to install the official version of fcl together with
  hpp-fcl.
parent 1e8eefeb
......@@ -34,7 +34,6 @@
cmake_minimum_required(VERSION 2.8)
set(CXX_DISABLE_WERROR TRUE)
set(CUSTOM_HEADER_DIR fcl)
include(cmake/base.cmake)
include(cmake/boost.cmake)
......@@ -61,103 +60,103 @@ add_optional_dependency("octomap >= 1.6")
# endif()
SET(${PROJECT_NAME}_HEADERS
include/fcl/collision_data.h
include/fcl/profile.h
include/fcl/exception.h
include/fcl/ccd/taylor_vector.h
include/fcl/ccd/interval_vector.h
include/fcl/ccd/simplex.h
include/fcl/ccd/support.h
include/fcl/ccd/interval_matrix.h
include/fcl/ccd/interval.h
include/fcl/ccd/interpolation/interpolation_factory.h
include/fcl/ccd/interpolation/interpolation_linear.h
include/fcl/ccd/interpolation/interpolation.h
include/fcl/ccd/conservative_advancement.h
include/fcl/ccd/taylor_model.h
include/fcl/ccd/taylor_matrix.h
include/fcl/ccd/motion_base.h
include/fcl/ccd/motion.h
include/fcl/deprecated.h
include/fcl/BV/kIOS.h
include/fcl/BV/BV.h
include/fcl/BV/RSS.h
include/fcl/BV/OBBRSS.h
include/fcl/BV/BV_node.h
include/fcl/BV/AABB.h
include/fcl/BV/OBB.h
include/fcl/BV/kDOP.h
include/fcl/narrowphase/narrowphase.h
include/fcl/narrowphase/gjk.h
include/fcl/narrowphase/gjk_libccd.h
include/fcl/broadphase/interval_tree.h
include/fcl/broadphase/broadphase_spatialhash.h
include/fcl/broadphase/broadphase_dynamic_AABB_tree.h
include/fcl/broadphase/broadphase_SSaP.h
include/fcl/broadphase/broadphase_interval_tree.h
include/fcl/broadphase/broadphase.h
include/fcl/broadphase/hierarchy_tree.h
include/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h
include/fcl/broadphase/broadphase_SaP.h
include/fcl/broadphase/broadphase_bruteforce.h
include/fcl/broadphase/morton.h
include/fcl/broadphase/hash.h
include/fcl/learning/classifier.h
include/fcl/shape/geometric_shapes_utility.h
include/fcl/shape/geometric_shape_to_BVH_model.h
include/fcl/shape/geometric_shapes.h
include/fcl/simd/simd_intersect.h
include/fcl/simd/math_simd_details.h
include/fcl/distance_func_matrix.h
include/fcl/collision.h
include/fcl/collision_node.h
include/fcl/collision_func_matrix.h
include/fcl/distance.h
include/fcl/knn/greedy_kcenters.h
include/fcl/knn/nearest_neighbors_GNAT.h
include/fcl/knn/nearest_neighbors_flann.h
include/fcl/knn/nearest_neighbors_sqrtapprox.h
include/fcl/knn/nearest_neighbors_linear.h
include/fcl/knn/nearest_neighbors.h
include/fcl/continuous_collision.h
include/fcl/math/vec_nf.h
include/fcl/math/matrix_3f.h
include/fcl/math/vec_3f.h
include/fcl/math/sampling.h
include/fcl/math/math_details.h
include/fcl/math/transform.h
include/fcl/traversal/traversal_node_shapes.h
include/fcl/traversal/traversal_node_setup.h
include/fcl/traversal/traversal_recurse.h
include/fcl/traversal/traversal_node_octree.h
include/fcl/traversal/traversal_node_bvhs.h
include/fcl/traversal/traversal_node_bvh_shape.h
include/fcl/traversal/traversal_node_base.h
include/fcl/data_types.h
include/fcl/articulated_model/model.h
include/fcl/articulated_model/joint_config.h
include/fcl/articulated_model/model_config.h
include/fcl/articulated_model/joint.h
include/fcl/articulated_model/link.h
include/fcl/BVH/BV_splitter.h
include/fcl/BVH/BVH_internal.h
include/fcl/BVH/BVH_model.h
include/fcl/BVH/BV_fitter.h
include/fcl/BVH/BVH_front.h
include/fcl/BVH/BVH_utility.h
include/fcl/intersect.h
include/fcl/collision_object.h
include/fcl/octree.h
include/fcl/fwd.hh
include/hpp/fcl/collision_data.h
include/hpp/fcl/profile.h
include/hpp/fcl/exception.h
include/hpp/fcl/ccd/taylor_vector.h
include/hpp/fcl/ccd/interval_vector.h
include/hpp/fcl/ccd/simplex.h
include/hpp/fcl/ccd/support.h
include/hpp/fcl/ccd/interval_matrix.h
include/hpp/fcl/ccd/interval.h
include/hpp/fcl/ccd/interpolation/interpolation_factory.h
include/hpp/fcl/ccd/interpolation/interpolation_linear.h
include/hpp/fcl/ccd/interpolation/interpolation.h
include/hpp/fcl/ccd/conservative_advancement.h
include/hpp/fcl/ccd/taylor_model.h
include/hpp/fcl/ccd/taylor_matrix.h
include/hpp/fcl/ccd/motion_base.h
include/hpp/fcl/ccd/motion.h
include/hpp/fcl/deprecated.h
include/hpp/fcl/BV/kIOS.h
include/hpp/fcl/BV/BV.h
include/hpp/fcl/BV/RSS.h
include/hpp/fcl/BV/OBBRSS.h
include/hpp/fcl/BV/BV_node.h
include/hpp/fcl/BV/AABB.h
include/hpp/fcl/BV/OBB.h
include/hpp/fcl/BV/kDOP.h
include/hpp/fcl/narrowphase/narrowphase.h
include/hpp/fcl/narrowphase/gjk.h
include/hpp/fcl/narrowphase/gjk_libccd.h
include/hpp/fcl/broadphase/interval_tree.h
include/hpp/fcl/broadphase/broadphase_spatialhash.h
include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h
include/hpp/fcl/broadphase/broadphase_SSaP.h
include/hpp/fcl/broadphase/broadphase_interval_tree.h
include/hpp/fcl/broadphase/broadphase.h
include/hpp/fcl/broadphase/hierarchy_tree.h
include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h
include/hpp/fcl/broadphase/broadphase_SaP.h
include/hpp/fcl/broadphase/broadphase_bruteforce.h
include/hpp/fcl/broadphase/morton.h
include/hpp/fcl/broadphase/hash.h
include/hpp/fcl/learning/classifier.h
include/hpp/fcl/shape/geometric_shapes_utility.h
include/hpp/fcl/shape/geometric_shape_to_BVH_model.h
include/hpp/fcl/shape/geometric_shapes.h
include/hpp/fcl/simd/simd_intersect.h
include/hpp/fcl/simd/math_simd_details.h
include/hpp/fcl/distance_func_matrix.h
include/hpp/fcl/collision.h
include/hpp/fcl/collision_node.h
include/hpp/fcl/collision_func_matrix.h
include/hpp/fcl/distance.h
include/hpp/fcl/knn/greedy_kcenters.h
include/hpp/fcl/knn/nearest_neighbors_GNAT.h
include/hpp/fcl/knn/nearest_neighbors_flann.h
include/hpp/fcl/knn/nearest_neighbors_sqrtapprox.h
include/hpp/fcl/knn/nearest_neighbors_linear.h
include/hpp/fcl/knn/nearest_neighbors.h
include/hpp/fcl/continuous_collision.h
include/hpp/fcl/math/vec_nf.h
include/hpp/fcl/math/matrix_3f.h
include/hpp/fcl/math/vec_3f.h
include/hpp/fcl/math/sampling.h
include/hpp/fcl/math/math_details.h
include/hpp/fcl/math/transform.h
include/hpp/fcl/traversal/traversal_node_shapes.h
include/hpp/fcl/traversal/traversal_node_setup.h
include/hpp/fcl/traversal/traversal_recurse.h
include/hpp/fcl/traversal/traversal_node_octree.h
include/hpp/fcl/traversal/traversal_node_bvhs.h
include/hpp/fcl/traversal/traversal_node_bvh_shape.h
include/hpp/fcl/traversal/traversal_node_base.h
include/hpp/fcl/data_types.h
include/hpp/fcl/articulated_model/model.h
include/hpp/fcl/articulated_model/joint_config.h
include/hpp/fcl/articulated_model/model_config.h
include/hpp/fcl/articulated_model/joint.h
include/hpp/fcl/articulated_model/link.h
include/hpp/fcl/BVH/BV_splitter.h
include/hpp/fcl/BVH/BVH_internal.h
include/hpp/fcl/BVH/BVH_model.h
include/hpp/fcl/BVH/BV_fitter.h
include/hpp/fcl/BVH/BVH_front.h
include/hpp/fcl/BVH/BVH_utility.h
include/hpp/fcl/intersect.h
include/hpp/fcl/collision_object.h
include/hpp/fcl/octree.h
include/hpp/fcl/fwd.hh
)
pkg_config_append_libs("hpp-fcl")
add_subdirectory(src)
add_subdirectory(test)
config_files(include/fcl/config-fcl.hh)
install(FILES ${PROJECT_BINARY_DIR}/include/fcl/config-fcl.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fcl
config_files(include/hpp/fcl/config-fcl.hh)
install(FILES ${PROJECT_BINARY_DIR}/include/hpp/fcl/config-fcl.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hpp/fcl
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
)
setup_project_finalize()
......@@ -39,7 +39,7 @@
#define FCL_AABB_H
#include <stdexcept>
#include "fcl/math/vec_3f.h"
#include <hpp/fcl/math/vec_3f.h>
namespace fcl
{
......
......@@ -39,13 +39,13 @@
#define FCL_BV_H
#include "fcl/BV/kDOP.h"
#include "fcl/BV/AABB.h"
#include "fcl/BV/OBB.h"
#include "fcl/BV/RSS.h"
#include "fcl/BV/OBBRSS.h"
#include "fcl/BV/kIOS.h"
#include "fcl/math/transform.h"
#include <hpp/fcl/BV/kDOP.h>
#include <hpp/fcl/BV/AABB.h>
#include <hpp/fcl/BV/OBB.h>
#include <hpp/fcl/BV/RSS.h>
#include <hpp/fcl/BV/OBBRSS.h>
#include <hpp/fcl/BV/kIOS.h>
#include <hpp/fcl/math/transform.h>
/** \brief Main namespace */
namespace fcl
......
......@@ -39,10 +39,10 @@
#ifndef FCL_BV_NODE_H
#define FCL_BV_NODE_H
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include <hpp/fcl/math/vec_3f.h>
#include <hpp/fcl/math/matrix_3f.h>
#include "fcl/BV/BV.h"
#include <hpp/fcl/BV/BV.h>
#include <iostream>
namespace fcl
......
......@@ -39,8 +39,8 @@
#define FCL_OBB_H
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include <hpp/fcl/math/vec_3f.h>
#include <hpp/fcl/math/matrix_3f.h>
namespace fcl
{
......
......@@ -39,8 +39,8 @@
#define FCL_OBBRSS_H
#include "fcl/BV/OBB.h"
#include "fcl/BV/RSS.h"
#include <hpp/fcl/BV/OBB.h>
#include <hpp/fcl/BV/RSS.h>
namespace fcl
{
......
......@@ -39,8 +39,8 @@
#define FCL_RSS_H
#include <stdexcept>
#include "fcl/math/vec_3f.h"
#include "fcl/math/matrix_3f.h"
#include <hpp/fcl/math/vec_3f.h>
#include <hpp/fcl/math/matrix_3f.h>
#include <boost/math/constants/constants.hpp>
namespace fcl
......
......@@ -39,7 +39,7 @@
#define FCL_KDOP_H
#include <stdexcept>
#include "fcl/math/vec_3f.h"
#include <hpp/fcl/math/vec_3f.h>
namespace fcl
{
......
......@@ -38,7 +38,7 @@
#ifndef FCL_KIOS_H
#define FCL_KIOS_H
#include "fcl/BV/OBB.h"
#include <hpp/fcl/BV/OBB.h>
namespace fcl
......
......@@ -38,7 +38,7 @@
#ifndef FCL_BVH_INTERNAL_H
#define FCL_BVH_INTERNAL_H
#include "fcl/data_types.h"
#include <hpp/fcl/data_types.h>
namespace fcl
{
......
......@@ -38,11 +38,11 @@
#ifndef FCL_BVH_MODEL_H
#define FCL_BVH_MODEL_H
#include "fcl/collision_object.h"
#include "fcl/BVH/BVH_internal.h"
#include "fcl/BV/BV_node.h"
#include "fcl/BVH/BV_splitter.h"
#include "fcl/BVH/BV_fitter.h"
#include <hpp/fcl/collision_object.h>
#include <hpp/fcl/BVH/BVH_internal.h>
#include <hpp/fcl/BV/BV_node.h>
#include <hpp/fcl/BVH/BV_splitter.h>
#include <hpp/fcl/BVH/BV_fitter.h>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
......
......@@ -39,7 +39,7 @@
#ifndef FCL_BVH_UTILITY_H
#define FCL_BVH_UTILITY_H
#include "fcl/BVH/BVH_model.h"
#include <hpp/fcl/BVH/BVH_model.h>
namespace fcl
......
......@@ -38,9 +38,9 @@
#ifndef FCL_BV_FITTER_H
#define FCL_BV_FITTER_H
#include "fcl/BVH/BVH_internal.h"
#include "fcl/BV/kIOS.h"
#include "fcl/BV/OBBRSS.h"
#include <hpp/fcl/BVH/BVH_internal.h>
#include <hpp/fcl/BV/kIOS.h>
#include <hpp/fcl/BV/OBBRSS.h>
#include <iostream>
namespace fcl
......
......@@ -38,9 +38,9 @@
#ifndef FCL_BV_SPLITTER_H
#define FCL_BV_SPLITTER_H
#include "fcl/BVH/BVH_internal.h"
#include "fcl/BV/kIOS.h"
#include "fcl/BV/OBBRSS.h"
#include <hpp/fcl/BVH/BVH_internal.h>
#include <hpp/fcl/BV/kIOS.h>
#include <hpp/fcl/BV/OBBRSS.h>
#include <vector>
#include <iostream>
......
......@@ -38,8 +38,8 @@
#ifndef FCL_ARTICULATED_MODEL_JOINT_H
#define FCL_ARTICULATED_MODEL_JOINT_H
#include "fcl/math/transform.h"
#include "fcl/data_types.h"
#include <hpp/fcl/math/transform.h>
#include <hpp/fcl/data_types.h>
#include <string>
#include <vector>
......
......@@ -38,7 +38,7 @@
#ifndef FCL_ARTICULATED_MODEL_JOINT_CONFIG_H
#define FCL_ARTICULATED_MODEL_JOINT_CONFIG_H
#include "fcl/data_types.h"
#include <hpp/fcl/data_types.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <vector>
......
......@@ -38,8 +38,8 @@
#ifndef FCL_ARTICULATED_MODEL_LINK_H
#define FCL_ARTICULATED_MODEL_LINK_H
#include "fcl/data_types.h"
#include "fcl/collision_object.h"
#include <hpp/fcl/data_types.h>
#include <hpp/fcl/collision_object.h>
#include <boost/shared_ptr.hpp>
#include <vector>
......
......@@ -38,10 +38,10 @@
#ifndef FCL_ARTICULATED_MODEL_MODEL_H
#define FCL_ARTICULATED_MODEL_MODEL_H
#include "fcl/articulated_model/joint.h"
#include "fcl/articulated_model/link.h"
#include <hpp/fcl/articulated_model/joint.h>
#include <hpp/fcl/articulated_model/link.h>
#include "fcl/data_types.h"
#include <hpp/fcl/data_types.h>
#include <boost/shared_ptr.hpp>
#include <map>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment