From 5f2e2ad7489b90a32faa455e5db487f6a4b6b490 Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Tue, 12 Jul 2016 09:35:56 +0200
Subject: [PATCH] [C++][CMake] Rename and export definition inside .pc file
---
CMakeLists.txt | 7 +++++--
cmake | 2 +-
include/hpp/fcl/config-fcl.hh.in | 1 -
include/hpp/fcl/mesh_loader/assimp.h | 28 ++++++++++++++--------------
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4cb8af9..c1384827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,10 +78,10 @@ endif()
ADD_REQUIRED_DEPENDENCY("assimp >= 2.0")
if(ASSIMP_FOUND)
if (NOT ${ASSIMP_VERSION} VERSION_LESS "2.0.1150")
- set(FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES 1 )
+ add_definitions(-DFCL_USE_ASSIMP_UNIFIED_HEADER_NAMES)
+ SET(WITH_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES TRUE)
message(STATUS "Assimp version has unified headers")
else()
- set(FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES 0 )
message(STATUS "Assimp version does not have unified headers")
endif()
endif()
@@ -191,6 +191,9 @@ add_subdirectory(test)
pkg_config_append_libs("hpp-fcl")
PKG_CONFIG_APPEND_BOOST_LIBS(thread date_time filesystem system)
+IF(WITH_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES)
+ PKG_CONFIG_APPEND_CFLAGS("-DFCL_USE_ASSIMP_UNIFIED_HEADER_NAMES")
+ENDIF(WITH_FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES)
config_files(include/hpp/fcl/config-fcl.hh)
install(FILES ${PROJECT_BINARY_DIR}/include/hpp/fcl/config-fcl.hh
diff --git a/cmake b/cmake
index 2fabb108..bd35ff07 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 2fabb1085371c98e8254f3f090e0a6700bd5ef48
+Subproject commit bd35ff07dc0ae377ba1d04815ff98a270d31f4d7
diff --git a/include/hpp/fcl/config-fcl.hh.in b/include/hpp/fcl/config-fcl.hh.in
index 203fed30..e8a2448f 100644
--- a/include/hpp/fcl/config-fcl.hh.in
+++ b/include/hpp/fcl/config-fcl.hh.in
@@ -43,7 +43,6 @@
#cmakedefine01 FCL_HAVE_OCTOMAP
#cmakedefine01 FCL_HAVE_FLANN
#cmakedefine01 FCL_HAVE_TINYXML
-#cmakedefine01 FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
#endif // FCL_CONFIG_FCL_HH
diff --git a/include/hpp/fcl/mesh_loader/assimp.h b/include/hpp/fcl/mesh_loader/assimp.h
index a4b5d8c5..3714a0ae 100644
--- a/include/hpp/fcl/mesh_loader/assimp.h
+++ b/include/hpp/fcl/mesh_loader/assimp.h
@@ -39,20 +39,20 @@
#include <hpp/fcl/config-fcl.hh>
-#if FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
-#include <assimp/DefaultLogger.hpp>
-#include <assimp/IOStream.hpp>
-#include <assimp/IOSystem.hpp>
-#include <assimp/scene.h>
-#include <assimp/Importer.hpp>
-#include <assimp/postprocess.h>
- #else
-#include <assimp/DefaultLogger.h>
-#include <assimp/assimp.hpp>
-#include <assimp/IOStream.h>
-#include <assimp/IOSystem.h>
-#include <assimp/aiScene.h>
-#include <assimp/aiPostProcess.h>
+#ifdef FCL_USE_ASSIMP_UNIFIED_HEADER_NAMES
+ #include <assimp/DefaultLogger.hpp>
+ #include <assimp/IOStream.hpp>
+ #include <assimp/IOSystem.hpp>
+ #include <assimp/scene.h>
+ #include <assimp/Importer.hpp>
+ #include <assimp/postprocess.h>
+#else
+ #include <assimp/DefaultLogger.h>
+ #include <assimp/assimp.hpp>
+ #include <assimp/IOStream.h>
+ #include <assimp/IOSystem.h>
+ #include <assimp/aiScene.h>
+ #include <assimp/aiPostProcess.h>
#endif
#include <hpp/fcl/BV/OBBRSS.h>
--
GitLab