Skip to content

Commit

Permalink
Merge pull request #16 from matthias-mayr/pr_dependencies
Browse files Browse the repository at this point in the history
Chore: Adds yaml-cpp as dependency, use catkin_make and install rosdep
  • Loading branch information
matthias-mayr authored Nov 7, 2023
2 parents 7eb6f7a + 9e7dd16 commit e808ba3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ cd catkin_ws
git clone https://github.com/matthias-mayr/Cartesian-Impedance-Controller src/Cartesian-Impedance-Controller
src/Cartesian-Impedance-Controller/scripts/install_dependencies.sh
rosdep install --from-paths src --ignore-src --rosdistro=${ROS_DISTRO} -y
catkin build # or catkin_make
catkin_make # or 'catkin build'
source devel/setup.bash
```

Expand Down Expand Up @@ -318,4 +318,4 @@ When starting the controller, this message appears:

### Controller crashes

Most likely this happens because some parts of the stack like `iiwa_ros` or `RBDyn` were built with `SIMD`/`march=native` being turned on and other parts are not. Everything needs to be built with or without this option in order to have working alignment. This package builds without, because it is otherwise cumbersome for people to ensure that this happens across the whole stack.
Most likely this happens because some parts of the stack like `iiwa_ros` or `RBDyn` were built with `SIMD`/`march=native` being turned on and other parts are not. Everything needs to be built with or without this option in order to have working alignment. This package builds without, because it is otherwise cumbersome for people to ensure that this happens across the whole stack.
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<exec_depend>tf</exec_depend>
<exec_depend>tf_conversions</exec_depend>
<exec_depend>trajectory_msgs</exec_depend>
<exec_depend>yaml-cpp</exec_depend>

<export>
<!-- Other tools can request additional information be placed here -->
Expand All @@ -64,4 +65,5 @@
<test_depend>geometry_msgs</test_depend>
<test_depend>std_msgs</test_depend>
<test_depend>dynamic_reconfigure</test_depend>
<test_depend>yaml-cpp</test_depend>
</package>
4 changes: 2 additions & 2 deletions scripts/install_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

sudo apt install python3-rosdep
if [ ! -d "src" ]
then
print "This script should be run in a catkin workspace. Exiting."
Expand Down Expand Up @@ -43,4 +43,4 @@ sudo make install
cd ../..

# Rebuild the library cache
sudo ldconfig
sudo ldconfig

0 comments on commit e808ba3

Please sign in to comment.