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

Jump to bottom

Fix compile erros when using RoboStack (conda) #453

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

Fix compile erros when using RoboStack (conda) #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e045801
Add console_bridge as requirement
nberliner Aug 13, 2021
682439b
Add console_bridge as requirement
nberliner Aug 13, 2021
9e55d2f
Add -D__STDC_FORMAT_MACROS
nberliner Aug 13, 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
4 changes: 4 additions & 0 deletions ur_calibration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ 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
)
find_package(Eigen3 REQUIRED)
find_package(yaml-cpp REQUIRED)
find_package(ur_client_library REQUIRED)
find_package(console_bridge REQUIRED)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to make more sense to rely on rosconsole since we use ros/console.h inside the log handler.


# create alias for the '_INCLUDE_DIR' variable, to help Catkin export it
set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
Expand Down Expand Up @@ -50,6 +53,7 @@ target_link_libraries(calibration_correction
${catkin_LIBRARIES}
${YAML_CPP_LIBRARIES}
ur_client_library::urcl
console_bridge::console_bridge
)

install(DIRECTORY launch
Expand Down
3 changes: 2 additions & 1 deletion ur_robot_driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down