Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing rviz marker tools dependency #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix missing rviz marker tools dependency #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e696cce
fixed missing OpenCV stuff in CMakeLists.txt
Jan 24, 2021
c774403
added rviz_marker_tools dependency
Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deep_grasp_task/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ find_package(catkin REQUIRED COMPONENTS
moveit_task_constructor_msgs
roscpp
rosparam_shortcuts
rviz_marker_tools
)

###################################
Expand Down
1 change: 1 addition & 0 deletions deep_grasp_task/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@
<depend>moveit_core</depend>
<depend>roscpp</depend>
<depend>rosparam_shortcuts</depend>
<depend>rviz_marker_tools</depend>
</package>
93 changes: 49 additions & 44 deletions moveit_task_constructor_gpd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ add_definitions(-W -Wall -Wextra

# Find catkin macros and libraries
find_package(catkin REQUIRED COMPONENTS
actionlib
eigen_conversions
geometry_msgs
message_generation
moveit_task_constructor_msgs
roscpp
rosparam_shortcuts
sensor_msgs
std_msgs
actionlib
eigen_conversions
geometry_msgs
message_generation
moveit_task_constructor_msgs
roscpp
rosparam_shortcuts
sensor_msgs
std_msgs
)

# System dependencies are found with CMake's conventions
find_package(Eigen3 REQUIRED)
find_package(PCL 1.8 REQUIRED)
find_package(OpenCV REQUIRED)

find_library(GPD_LIB NAMES gpd PATHS /usr/local/lib PATH_SUFFIXES lib NO_DEFAULT_PATH)
if (GPD_LIB)
Expand All @@ -36,7 +37,7 @@ endif()

find_path(GPD_INCLUDE_DIRS NAMES gpd PATHS /usr/local/include NO_DEFAULT_PATH)
if (GPD_INCLUDE_DIRS)
message(STATUS "Include directory GPD found in ${GPD_INCLUDE_DIRS}")
message(STATUS "Include directory GPD found in ${GPD_INCLUDE_DIRS}")
else()
message(FATAL_ERROR "Include directory GPD not found")
endif()
Expand All @@ -57,18 +58,18 @@ generate_messages(
## Catkin specific configuration ##
###################################
catkin_package(
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS
eigen_conversions
geometry_msgs
message_runtime
moveit_task_constructor_msgs
sensor_msgs
std_msgs
DEPENDS
EIGEN3
PCL
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS
eigen_conversions
geometry_msgs
message_runtime
moveit_task_constructor_msgs
sensor_msgs
std_msgs
DEPENDS
EIGEN3
PCL
)

###########
Expand All @@ -80,8 +81,9 @@ catkin_package(
include_directories(
SYSTEM
${EIGEN3_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
${GPD_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
${GPD_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
)

include_directories(
Expand All @@ -98,55 +100,58 @@ add_library(${PROJECT_NAME}
## as an example, code may need to be generated before libraries
## either from message generation or dynamic reconfigure
add_dependencies(${PROJECT_NAME}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)


# Specify libraries to link a library or executable target against
target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${PCL_LIBRARIES}
${catkin_LIBRARIES}
${PCL_LIBRARIES}
${OpenCV_LIBRARIES}
)

# Declare a C++ executable
add_executable(grasp_cloud_detection
src/grasp_cloud_detection.cpp
src/grasp_detection.cpp
src/grasp_cloud_detection.cpp
src/grasp_detection.cpp
)

add_executable(point_cloud_server
src/cloud_server.cpp
src/point_cloud_server.cpp
src/cloud_server.cpp
src/point_cloud_server.cpp
)


## Add cmake target dependencies of the executable
## same as for the library above
add_dependencies(grasp_cloud_detection
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)

add_dependencies(point_cloud_server
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS}
)


# Specify libraries to link a library or executable target against
target_link_libraries(grasp_cloud_detection
${catkin_LIBRARIES}
${PROJECT_NAME}
${Eigen3_LIBRARIES}
${PCL_LIBRARIES}
${GPD_LIB}
${catkin_LIBRARIES}
${PROJECT_NAME}
${Eigen3_LIBRARIES}
${PCL_LIBRARIES}
${GPD_LIB}
${OpenCV_LIBRARIES}
)

target_link_libraries(point_cloud_server
${catkin_LIBRARIES}
${PROJECT_NAME}
${PCL_LIBRARIES}
${catkin_LIBRARIES}
${PROJECT_NAME}
${PCL_LIBRARIES}
${OpenCV_LIBRARIES}
)

#############
Expand Down