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
63c56ebb
Commit
63c56ebb
authored
Nov 19, 2019
by
Joseph Mirabel
Browse files
[CMake] export target hpp-fcl
parent
199a3c7b
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
63c56ebb
...
...
@@ -39,6 +39,7 @@ set(PROJECT_NAME hpp-fcl)
set
(
PROJECT_DESCRIPTION
"HPP fork of FCL -- The Flexible Collision Library"
)
SET
(
PROJECT_USE_CMAKE_EXPORT TRUE
)
include
(
cmake/eigen.cmake
)
include
(
cmake/boost.cmake
)
...
...
@@ -73,16 +74,11 @@ search_for_boost()
# Optional dependencies
add_optional_dependency
(
"octomap >= 1.6"
)
if
(
OCTOMAP_FOUND
)
link_directories
(
${
OCTOMAP_LIBRARY_DIRS
}
)
SET
(
HPP_FCL_HAVE_OCTOMAP TRUE
)
add_definitions
(
-DHPP_FCL_HAVE_OCTOMAP
)
string
(
REPLACE
"."
";"
VERSION_LIST
${
OCTOMAP_VERSION
}
)
list
(
GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION
)
list
(
GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION
)
list
(
GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION
)
add_definitions
(
-DOCTOMAP_MAJOR_VERSION=
${
OCTOMAP_MAJOR_VERSION
}
-DOCTOMAP_MINOR_VERSION=
${
OCTOMAP_MINOR_VERSION
}
-DOCTOMAP_PATCH_VERSION=
${
OCTOMAP_PATCH_VERSION
}
)
message
(
STATUS
"FCL uses Octomap"
)
else
()
SET
(
HPP_FCL_HAVE_OCTOMAP FALSE
)
...
...
src/CMakeLists.txt
View file @
63c56ebb
...
...
@@ -105,6 +105,15 @@ else()
endif
()
IF
(
OCTOMAP_FOUND
)
PKG_CONFIG_USE_DEPENDENCY
(
${
LIBRARY_NAME
}
octomap
)
target_compile_definitions
(
${
LIBRARY_NAME
}
PUBLIC
-DHPP_FCL_HAVE_OCTOMAP
-DOCTOMAP_MAJOR_VERSION=
${
OCTOMAP_MAJOR_VERSION
}
-DOCTOMAP_MINOR_VERSION=
${
OCTOMAP_MINOR_VERSION
}
-DOCTOMAP_PATCH_VERSION=
${
OCTOMAP_PATCH_VERSION
}
)
ENDIF
(
OCTOMAP_FOUND
)
install
(
TARGETS
${
LIBRARY_NAME
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
target_include_directories
(
${
LIBRARY_NAME
}
PUBLIC
$<INSTALL_INTERFACE:
${
CMAKE_INSTALL_INCLUDEDIR
}
>
)
install
(
TARGETS
${
LIBRARY_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
test/CMakeLists.txt
View file @
63c56ebb
...
...
@@ -22,11 +22,7 @@ endmacro(add_fcl_test)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_library
(
utility STATIC utility.cpp
)
target_include_directories
(
utility SYSTEM PUBLIC
${
EIGEN3_INCLUDE_DIRS
}
${
Boost_INCLUDE_DIRS
}
$<$<BOOL:
${
HPP_FCL_HAVE_OCTOMAP
}
>:
${
OCTOMAP_INCLUDE_DIRS
}
>
)
target_link_libraries
(
utility hpp-fcl
)
add_fcl_test
(
math math.cpp
)
...
...
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