From e0458011ba600fcdbb1bc91787124058dbca5ab6 Mon Sep 17 00:00:00 2001 From: Niklas Berliner Date: Fri, 13 Aug 2021 16:19:09 +0200 Subject: [PATCH 1/3] Add console_bridge as requirement --- ur_robot_driver/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ur_robot_driver/CMakeLists.txt b/ur_robot_driver/CMakeLists.txt index e20817320..fed915817 100644 --- a/ur_robot_driver/CMakeLists.txt +++ b/ur_robot_driver/CMakeLists.txt @@ -30,6 +30,7 @@ find_package(catkin REQUIRED ) find_package(Boost REQUIRED) find_package(ur_client_library REQUIRED) +find_package(console_bridge REQUIRED) catkin_package( INCLUDE_DIRS @@ -92,7 +93,7 @@ add_dependencies(ur_robot_driver_plugin ${${PROJECT_NAME}_EXPORTED_TARGETS} ${ca add_library(urcl_log_handler src/urcl_log_handler.cpp ) -target_link_libraries(urcl_log_handler ${catkin_LIBRARIES} ur_client_library::urcl) +target_link_libraries(urcl_log_handler ${catkin_LIBRARIES} ur_client_library::urcl console_bridge::console_bridge) add_executable(ur_robot_driver_node src/dashboard_client_ros.cpp From 682439b440632f47707640afd6155b746a206017 Mon Sep 17 00:00:00 2001 From: Niklas Berliner Date: Fri, 13 Aug 2021 16:20:20 +0200 Subject: [PATCH 2/3] Add console_bridge as requirement --- ur_calibration/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ur_calibration/CMakeLists.txt b/ur_calibration/CMakeLists.txt index 356394013..ace3d93f2 100644 --- a/ur_calibration/CMakeLists.txt +++ b/ur_calibration/CMakeLists.txt @@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS find_package(Eigen3 REQUIRED) find_package(yaml-cpp REQUIRED) find_package(ur_client_library REQUIRED) +find_package(console_bridge REQUIRED) # create alias for the '_INCLUDE_DIR' variable, to help Catkin export it set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) @@ -50,6 +51,7 @@ target_link_libraries(calibration_correction ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ur_client_library::urcl + console_bridge::console_bridge ) install(DIRECTORY launch From 9e55d2f1a21aaf85556dd9659acb806410d4c031 Mon Sep 17 00:00:00 2001 From: Niklas Berliner Date: Fri, 13 Aug 2021 16:21:27 +0200 Subject: [PATCH 3/3] Add -D__STDC_FORMAT_MACROS See https://github.com/RoboStack/ros-noetic/issues/155#issuecomment-897084877 --- ur_calibration/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ur_calibration/CMakeLists.txt b/ur_calibration/CMakeLists.txt index ace3d93f2..b553affc4 100644 --- a/ur_calibration/CMakeLists.txt +++ b/ur_calibration/CMakeLists.txt @@ -4,6 +4,8 @@ project(ur_calibration) ## Compile as C++11, supported in ROS Kinetic and newer add_compile_options(-std=c++11) +add_definitions(-D__STDC_FORMAT_MACROS) + find_package(catkin REQUIRED COMPONENTS roscpp ur_robot_driver