Change export header from fcl_export.h to fcl/export.h

Author: j-rivero

CMakeLists.txt

@@ -233,18 +233,12 @@ else()
   message(STATUS "FCL does not use OctoMap (as requested)")
 endif()
 
-# Need to include directory to find export file
-include_directories(${PROJECT_BINARY_DIR}) 
-
-install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}_export.h
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
 # FCL's own include dir should be at the front of the include path
 include_directories(BEFORE "include")
 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/include")
 
-add_subdirectory(include/fcl)
 add_subdirectory(src)
+add_subdirectory(include/fcl)
 
 set(pkg_conf_file_in "${CMAKE_CURRENT_SOURCE_DIR}/fcl.pc.in")
 set(pkg_conf_file_out "${CMAKE_CURRENT_BINARY_DIR}/fcl.pc")
@@ -275,8 +269,6 @@ if(FCL_BUILD_TESTS AND NOT FCL_HIDE_ALL_SYMBOLS)
     add_subdirectory(test)
 endif()
 
-generate_export_header(${PROJECT_NAME})
-
 #===============================================================================
 # API documentation using Doxygen
 # References:

include/fcl/CMakeLists.txt

@@ -2,6 +2,16 @@ file(GLOB_RECURSE HEADERS            ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
 file(GLOB_RECURSE CONFIGURED_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/*.h)
 set(FCL_HEADERS ${HEADERS} ${CONFIGURED_HEADERS} PARENT_SCOPE)
 
+# Generate export header. There is no way of generating a file name
+# called just export.h. Workaround using configure and remove
+generate_export_header(${PROJECT_NAME})
+configure_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h
+  ${CMAKE_CURRENT_BINARY_DIR}/export.h
+  COPYONLY)
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/export.h
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fcl)
 

include/fcl/broadphase/detail/interval_tree_node.h

@@ -39,7 +39,7 @@
 #define FCL_BROADPHASE_DETAIL_INTERVALTREENODE_H
 
 #include "fcl/broadphase/detail/simple_interval.h"
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/broadphase/detail/simple_interval.h

@@ -38,7 +38,7 @@
 #ifndef FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H
 #define FCL_BROADPHASE_DETAIL_SIMPLEINTERVAL_H
 
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/common/detail/profiler.h

@@ -49,7 +49,7 @@
 #include <thread>
 #include <vector>
 #include "fcl/common/time.h"
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl {
 namespace detail {

include/fcl/common/exception.h

@@ -41,7 +41,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/common/time.h

@@ -39,7 +39,7 @@
 #define FCL_COMMON_TIME_H
 
 #include <chrono>
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/common/types.h

@@ -45,7 +45,7 @@
 #include <memory>
 #include <Eigen/Dense>
 #include <Eigen/StdVector>
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/geometry/bvh/detail/BVH_front.h

@@ -39,7 +39,7 @@
 #define FCL_BVH_FRONT_H
 
 #include <list>
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/math/detail/polysolver.h

@@ -38,7 +38,7 @@
 #ifndef FCL_NARROWPHASE_DETAIL_POLYSOLVER_H
 #define FCL_NARROWPHASE_DETAIL_POLYSOLVER_H
 
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/math/detail/seed.h

@@ -39,7 +39,7 @@
 #define FCL_MATH_DETAIL_SEED_H
 
 #include <cstdint>
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/math/triangle.h

@@ -39,7 +39,7 @@
 #define FCL_MATH_TRIANGLE_H
 
 #include <cstddef>
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {

include/fcl/narrowphase/continuous_collision_request.h

@@ -40,7 +40,7 @@
 
 #include <cstddef>
 #include "fcl/narrowphase/gjk_solver_type.h"
-#include "fcl_export.h"
+#include "fcl/export.h"
 
 namespace fcl
 {