@@ -12,14 +12,14 @@ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
12
12
add_definitions (${EIGEN3_DEFINITIONS} )
13
13
14
14
find_package (orocos_kdl REQUIRED)
15
-
16
15
find_package (PkgConfig REQUIRED)
17
16
18
17
pkg_check_modules(ASSIMP assimp)
19
18
20
- pkg_check_modules(LIBFCL REQUIRED fcl)
21
- find_library (LIBFCL_LIBRARIES_FULL ${LIBFCL_LIBRARIES} ${LIBFCL_LIBRARY_DIRS} )
22
- set (fcl_LIBRARIES "${LIBFCL_LIBRARIES_FULL} " )
19
+ find_package (fcl REQUIRED)
20
+ find_package (ccd QUIET )
21
+ set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR} /CMakeModules" )
22
+ include_directories (${fcl_INCLUDE_DIRS} )
23
23
24
24
catkin_package(
25
25
CATKIN_DEPENDS cob_control_msgs cob_srvs dynamic_reconfigure eigen_conversions geometry_msgs kdl_conversions kdl_parser moveit_msgs roscpp roslib sensor_msgs shape_msgs std_msgs tf tf_conversions urdf visualization_msgs
@@ -29,19 +29,19 @@ catkin_package(
29
29
)
30
30
31
31
### BUILD ###
32
- include_directories (include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${FCL_INCLUDE_DIRS } ${orocos_kdl_INCLUDE_DIRS} ${ASSIMP_INCLUDE_DIRS} )
32
+ include_directories (include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CCD_INCLUDE_DIRS} ${ EIGEN3_INCLUDE_DIRS} ${fcl_INCLUDE_DIRS } ${orocos_kdl_INCLUDE_DIRS} ${ASSIMP_INCLUDE_DIRS} )
33
33
34
34
add_library (parsers src/parsers/mesh_parser.cpp src/parsers/stl_parser.cpp)
35
35
add_dependencies (parsers ${catkin_EXPORTED_TARGETS} )
36
- target_link_libraries (parsers assimp ${fcl_LIBRARIES} ${catkin_LIBRARIES} )
36
+ target_link_libraries (parsers assimp fcl ${catkin_LIBRARIES} )
37
37
38
38
add_library (marker_shapes_management src/link_to_collision.cpp src/marker_shapes/marker_shapes_impl.cpp src/marker_shapes/marker_shapes_interface.cpp src/shapes_manager.cpp)
39
39
add_dependencies (marker_shapes_management ${catkin_EXPORTED_TARGETS} )
40
- target_link_libraries (marker_shapes_management parsers ${fcl_LIBRARIES} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES} )
40
+ target_link_libraries (marker_shapes_management parsers fcl ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES} )
41
41
42
42
add_executable (${PROJECT_NAME} src/chainfk_solvers/advanced_chainfksolver_recursive.cpp src/${PROJECT_NAME} .cpp src/distance_manager.cpp src/helpers/helper_functions.cpp)
43
43
add_dependencies (${PROJECT_NAME} ${${PROJECT_NAME} _EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} )
44
- target_link_libraries (${PROJECT_NAME} parsers marker_shapes_management ${fcl_LIBRARIES } ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES} )
44
+ target_link_libraries (${PROJECT_NAME} parsers marker_shapes_management fcl ${CCD_LIBRARIES } ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES} )
45
45
46
46
add_executable (debug_obstacle_distance_node src/debug/debug_obstacle_distance_node.cpp)
47
47
add_dependencies (debug_obstacle_distance_node ${${PROJECT_NAME} _EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} )
0 commit comments