Commit 5f2e2ad7 authored by jcarpent's avatar jcarpent
Browse files

[C++][CMake] Rename and export definition inside .pc file

parent 7c9bdc12
......@@ -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
......
Subproject commit 2fabb1085371c98e8254f3f090e0a6700bd5ef48
Subproject commit bd35ff07dc0ae377ba1d04815ff98a270d31f4d7
......@@ -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
......@@ -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>
......
Markdown is supported
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