Skip to content
Snippets Groups Projects
Commit e8266ad0 authored by Alejandro Lopez Gestoso's avatar Alejandro Lopez Gestoso
Browse files

Fixed not exporting BT module library

parent ad9dbe4a
No related branches found
No related tags found
No related merge requests found
......@@ -100,9 +100,12 @@ generate_dynamic_reconfigure_options(
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
set(module_name tiago_arm_module)
set(module_bt_name tiago_arm_module_bt)
catkin_package(
INCLUDE_DIRS include
LIBRARIES tiago_arm_module
LIBRARIES ${module_name} ${module_bt_name}
CATKIN_DEPENDS roscpp dynamic_reconfigure iri_ros_tools actionlib geometry_msgs moveit_ros_planning_interface sensor_msgs iri_base_algorithm iri_base_bt_client iri_behaviortree
# DEPENDS system_lib
......@@ -119,7 +122,7 @@ include_directories(${catkin_INCLUDE_DIRS})
include_directories(${iriutils_INCLUDE_DIR})
## Declare a C++ library
set(module_name tiago_arm_module)
#Module
add_library(${module_name}
src/tiago_arm_module.cpp
)
......@@ -138,6 +141,7 @@ add_dependencies(${module_name} ${${PROJECT_NAME}_EXPORTED_TARGETS})
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/humanoid_modules_node.cpp)
#Module_client
set(client_name tiago_arm_client)
add_executable(${client_name} src/tiago_arm_client_alg.cpp src/tiago_arm_client_alg_node.cpp)
......@@ -148,13 +152,14 @@ target_link_libraries(${client_name} ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_
add_dependencies(${client_name} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${module_name})
add_dependencies(${client_name} ${tiago_arm_client_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
set(module_bt_name tiago_arm_module_bt)
#BT_module
add_library(${module_bt_name} src/tiago_arm_bt_module.cpp)
target_link_libraries(${module_bt_name} ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/lib${module_name}.so)
target_link_libraries(${module_bt_name} ${catkin_LIBRARIES})
target_link_libraries(${module_bt_name} ${iriutils_LIBRARIES})
add_dependencies(${module_bt_name} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS} ${module_name})
#BT_client
set(bt_client_name tiago_arm_bt_client)
add_executable(${bt_client_name} src/tiago_arm_bt_client_alg_node.cpp)
target_link_libraries(${bt_client_name} ${catkin_LIBRARIES})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment