Skip to content

Commit

Permalink
First bunch of fetch packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias-Fischer committed Apr 1, 2021
1 parent 6627203 commit f644211
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
16 changes: 16 additions & 0 deletions patch/ros-noetic-fetch-teleop.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/fetch_teleop/CMakeLists.txt b/fetch_teleop/CMakeLists.txt
index 15ec263..74a4014 100644
--- a/fetch_teleop/CMakeLists.txt
+++ b/fetch_teleop/CMakeLists.txt
@@ -29,6 +29,10 @@ target_link_libraries(joystick_teleop
${catkin_LIBRARIES}
)

+if(UNIX AND NOT APPLE)
+ target_link_libraries(joystick_teleop rt)
+endif()
+
install(
TARGETS joystick_teleop
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

14 changes: 14 additions & 0 deletions patch/ros-noetic-robot-calibration.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b73bd5b..ea1b825 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
project(robot_calibration)

if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall")
endif()

find_package(Boost REQUIRED system thread)

3 changes: 2 additions & 1 deletion vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ packages_select_by_deps:
# TODO Linux
##
# - pybind11_catkin # Needs to be patched to use conda-forge's pybind11
- spacenav_node
- fetch_ros

##
# DONE Linux
##
- spacenav_node
- hebi_cpp_api
- panda_moveit_config
- apriltag
Expand Down

0 comments on commit f644211

Please sign in to comment.