Skip to content

Commit 0f8c45c

Browse files
committed
fix undefined reference to symbol 'ccd_vec3_origin'
1 parent 576beb4 commit 0f8c45c

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

cob_obstacle_distance/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
1212
add_definitions(${EIGEN3_DEFINITIONS})
1313

1414
find_package(orocos_kdl REQUIRED)
15-
1615
find_package(PkgConfig REQUIRED)
1716

1817
pkg_check_modules(ASSIMP assimp)
1918

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})
2323

2424
catkin_package(
2525
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(
2929
)
3030

3131
### 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})
3333

3434
add_library(parsers src/parsers/mesh_parser.cpp src/parsers/stl_parser.cpp)
3535
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})
3737

3838
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)
3939
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})
4141

4242
add_executable(${PROJECT_NAME} src/chainfk_solvers/advanced_chainfksolver_recursive.cpp src/${PROJECT_NAME}.cpp src/distance_manager.cpp src/helpers/helper_functions.cpp)
4343
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})
4545

4646
add_executable(debug_obstacle_distance_node src/debug/debug_obstacle_distance_node.cpp)
4747
add_dependencies(debug_obstacle_distance_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

cob_obstacle_distance/package.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
<depend>dynamic_reconfigure</depend>
2222
<depend>eigen_conversions</depend>
2323
<depend>eigen</depend>
24-
<depend condition="$ROS_DISTRO != noetic">libfcl-dev</depend>
25-
<depend condition="$ROS_DISTRO == noetic">fcl</depend>
24+
<depend>fcl</depend>
2625
<depend>geometry_msgs</depend>
2726
<depend>kdl_conversions</depend>
2827
<depend>kdl_parser</depend>
28+
<depend>libccd-dev</depend>
29+
<depend>libfcl-dev</depend>
30+
<depend>liborocos-kdl-dev</depend>
2931
<depend>moveit_msgs</depend>
30-
<depend condition="$ROS_DISTRO == melodic">orocos_kdl</depend>
31-
<depend condition="$ROS_DISTRO == noetic">liborocos-kdl-dev</depend>
32-
<depend condition="$ROS_DISTRO == noetic">liborocos-kdl</depend>
3332
<depend>pkg-config</depend>
3433
<depend>roscpp</depend>
3534
<depend>roslib</depend>

0 commit comments

Comments
 (0)