Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_tiago_arm_module
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
ros
platforms
TIAGo
iri_tiago_arm_module
Commits
e8266ad0
Commit
e8266ad0
authored
4 years ago
by
Alejandro Lopez Gestoso
Browse files
Options
Downloads
Patches
Plain Diff
Fixed not exporting BT module library
parent
ad9dbe4a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+8
-3
8 additions, 3 deletions
CMakeLists.txt
with
8 additions
and
3 deletions
CMakeLists.txt
+
8
−
3
View file @
e8266ad0
...
...
@@ -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_m
odule
)
#M
odule
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
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment