Obbart/universal_robots_ros_driver
1
0
Fork 0
mirror of https://gitlab.com/obbart/universal_robots_ros_driver.git synced 2026-04-10 10:00:48 +02:00
Code Releases Activity

renamed targets to not clash with ur_modern_driver

Browse Source
This commit is contained in:
Felix Mauch
2019-04-01 13:19:54 +02:00
parent 99533e42d8
commit 515dd41edc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@@ -29,7 +29,7 @@ catkin_package(
INCLUDE_DIRS INCLUDE_DIRS
include include
LIBRARIES LIBRARIES
ur_hardware_interface ur_rtde_hardware_interface
CATKIN_DEPENDS CATKIN_DEPENDS
actionlib actionlib
control_msgs control_msgs
@@ -71,10 +71,10 @@ include_directories(
) )
# Hardware Interface # Hardware Interface
add_library(ur_hardware_interface add_library(ur_rtde_hardware_interface
src/ros/controller.cpp src/ros/controller.cpp
src/ros/hardware_interface.cpp) src/ros/hardware_interface.cpp)
target_link_libraries(ur_hardware_interface ${catkin_LIBRARIES}) target_link_libraries(ur_rtde_hardware_interface ${catkin_LIBRARIES})
set(${PROJECT_NAME}_SOURCES set(${PROJECT_NAME}_SOURCES
@@ -94,10 +94,10 @@ set(${PROJECT_NAME}_SOURCES
src/ur/server.cpp src/ur/server.cpp
src/ur/stream.cpp) src/ur/stream.cpp)
add_executable(ur_driver ${${PROJECT_NAME}_SOURCES} src/ros_main.cpp) add_executable(ur_rtde_driver ${${PROJECT_NAME}_SOURCES} src/ros_main.cpp)
add_dependencies(ur_driver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) add_dependencies(ur_rtde_driver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(ur_driver target_link_libraries(ur_rtde_driver
ur_hardware_interface ur_rtde_hardware_interface
${catkin_LIBRARIES} ${catkin_LIBRARIES}
) )
@@ -105,7 +105,7 @@ target_link_libraries(ur_driver
install(DIRECTORY config launch install(DIRECTORY config launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(TARGETS ur_driver ur_hardware_interface install(TARGETS ur_rtde_driver ur_rtde_hardware_interface
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
@@ -124,5 +124,5 @@ if (CATKIN_ENABLE_TESTING)
tests/ur/rt_state.cpp) tests/ur/rt_state.cpp)
catkin_add_gtest(ur_rtde_driver_test ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_TEST_SOURCES} tests/main.cpp) catkin_add_gtest(ur_rtde_driver_test ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_TEST_SOURCES} tests/main.cpp)
target_link_libraries(ur_rtde_driver_test ur_hardware_interface ${catkin_LIBRARIES}) target_link_libraries(ur_rtde_driver_test ur_rtde_hardware_interface ${catkin_LIBRARIES})
endif() endif()