From f7949e418a1ca57dc2531e2ea10567c15feb019c Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Tue, 5 Aug 2014 08:37:02 +0200
Subject: [PATCH] Re-introduce include/fcl/config-fcl.hh with a different name.
---
CMakeLists.txt | 5 +++
include/fcl/config-fcl.hh.in | 46 ++++++++++++++++++++
include/fcl/knn/nearest_neighbors_flann.h | 2 +-
include/fcl/math/vec_3f.h | 2 +-
include/fcl/traversal/traversal_node_setup.h | 2 +-
5 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 include/fcl/config-fcl.hh.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1841b679..16d1069a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,4 +154,9 @@ pkg_config_append_libs("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
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
+ )
setup_project_finalize()
diff --git a/include/fcl/config-fcl.hh.in b/include/fcl/config-fcl.hh.in
new file mode 100644
index 00000000..14cc27dd
--- /dev/null
+++ b/include/fcl/config-fcl.hh.in
@@ -0,0 +1,46 @@
+/*
+ * Software License Agreement (BSD License)
+ *
+ * Copyright (c) 2012, Willow Garage, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of Willow Garage, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FCL_CONFIG_FCL_HH
+# define FCL_CONFIG_FCL_HH
+
+# include "config.h"
+
+#cmakedefine01 FCL_HAVE_SSE
+#cmakedefine01 FCL_HAVE_OCTOMAP
+#cmakedefine01 FCL_HAVE_FLANN
+#cmakedefine01 FCL_HAVE_TINYXML
+
+#endif // FCL_CONFIG_FCL_HH
+
diff --git a/include/fcl/knn/nearest_neighbors_flann.h b/include/fcl/knn/nearest_neighbors_flann.h
index c63ff4c8..328f9f99 100644
--- a/include/fcl/knn/nearest_neighbors_flann.h
+++ b/include/fcl/knn/nearest_neighbors_flann.h
@@ -37,7 +37,7 @@
#ifndef FCL_KNN_NEAREST_NEIGHBORS_FLANN_H
#define FCL_KNN_NEAREST_NEIGHBORS_FLANN_H
-#include "fcl/config.h"
+#include <fcl/config-fcl.hh>
#if FCL_HAVE_FLANN == 0
# error FLANN is not available. Please use a different NearestNeighbors data structure
#else
diff --git a/include/fcl/math/vec_3f.h b/include/fcl/math/vec_3f.h
index 04fca74e..4c39e241 100644
--- a/include/fcl/math/vec_3f.h
+++ b/include/fcl/math/vec_3f.h
@@ -38,7 +38,7 @@
#ifndef FCL_VEC_3F_H
#define FCL_VEC_3F_H
-#include "fcl/config.h"
+#include <fcl/config-fcl.hh>
#include "fcl/data_types.h"
#include "fcl/math/math_details.h"
diff --git a/include/fcl/traversal/traversal_node_setup.h b/include/fcl/traversal/traversal_node_setup.h
index 6e016296..26ce827c 100644
--- a/include/fcl/traversal/traversal_node_setup.h
+++ b/include/fcl/traversal/traversal_node_setup.h
@@ -39,7 +39,7 @@
#ifndef FCL_TRAVERSAL_NODE_SETUP_H
#define FCL_TRAVERSAL_NODE_SETUP_H
-#include "fcl/config.h"
+#include <fcl/config-fcl.hh>
#include "fcl/traversal/traversal_node_bvhs.h"
#include "fcl/traversal/traversal_node_shapes.h"
#include "fcl/traversal/traversal_node_bvh_shape.h"
--
GitLab