Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilhem Saurel
hpp-fcl
Commits
5f2e2ad7
Commit
5f2e2ad7
authored
Jul 12, 2016
by
jcarpent
Browse files
[C++][CMake] Rename and export definition inside .pc file
parent
7c9bdc12
Changes
4
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5f2e2ad7
...
...
@@ -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
...
...
cmake
@
bd35ff07
Compare
2fabb108
...
bd35ff07
Subproject commit
2fabb1085371c98e8254f3f090e0a6700bd5ef48
Subproject commit
bd35ff07dc0ae377ba1d04815ff98a270d31f4d7
include/hpp/fcl/config-fcl.hh.in
View file @
5f2e2ad7
...
...
@@ -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
include/hpp/fcl/mesh_loader/assimp.h
View file @
5f2e2ad7
...
...
@@ -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>
#if
def
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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment