mirror of
https://github.com/elephantrobotics/mycobot_ros.git
synced 2026-07-14 09:00:53 +00:00
fix catkin_make
This commit is contained in:
parent
9cb52447d0
commit
188f8d5642
1 changed files with 12 additions and 12 deletions
|
|
@ -20,10 +20,10 @@ find_package(catkin REQUIRED COMPONENTS
|
||||||
catkin_package(
|
catkin_package(
|
||||||
CATKIN_DEPENDS std_msgs actionlib
|
CATKIN_DEPENDS std_msgs actionlib
|
||||||
|
|
||||||
INCLUDE_DIRS include
|
# INCLUDE_DIRS include
|
||||||
LIBRARIES mycobot_320
|
# LIBRARIES mycobot_320
|
||||||
CATKIN_DEPENDS mycobot_communication mycobot_description
|
# CATKIN_DEPENDS mycobot_communication mycobot_description
|
||||||
DEPENDS system_lib
|
# DEPENDS system_lib
|
||||||
)
|
)
|
||||||
|
|
||||||
## Build talker and listener
|
## Build talker and listener
|
||||||
|
|
@ -46,12 +46,12 @@ install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
|
||||||
PATTERN "setup_assistant.launch" EXCLUDE)
|
PATTERN "setup_assistant.launch" EXCLUDE)
|
||||||
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
|
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
|
||||||
|
|
||||||
find_package(OpenCV REQUIRED)
|
# find_package(OpenCV REQUIRED)
|
||||||
add_executable(opencv_camera src/opencv_camera.cpp)
|
# add_executable(opencv_camera src/opencv_camera.cpp)
|
||||||
# Declare a C++ library
|
# Declare a C++ library
|
||||||
add_library(${PROJECT_NAME}
|
# add_library(${PROJECT_NAME}
|
||||||
src/opencv_camera.cpp
|
# src/opencv_camera.cpp
|
||||||
)
|
# )
|
||||||
target_link_libraries(opencv_camera ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
|
# target_link_libraries(opencv_camera ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
|
||||||
add_executable(camera_display src/camera_display)
|
# add_executable(camera_display src/camera_display)
|
||||||
target_link_libraries(camera_display ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
|
# target_link_libraries(camera_display ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue