Merge pull request #836 from cyberbotics/sync-master-c7a5f08

Merge master into develop
cyberbotics · Jul 19, 2023 · 7efd8a6 · 7efd8a6
2 parents a13f089 + e7ae291
commit 7efd8a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/scripts/ci_after_init.bash b/scripts/ci_after_init.bash
@@ -14,7 +14,7 @@ NIGHTLY_DATE=`date --date="${LAST_NIGHTLY_DAY_OLD} day ago" +"%-d_%-m_%Y"`
 WEBOTS_NIGHTLY_VERSION="nightly_${NIGHTLY_DATE}"
 
 apt update
-apt install -y wget dialog apt-utils psmisc lsb-release git libyaml-cpp-dev
+apt install -y wget dialog apt-utils psmisc lsb-release git
 wget https://github.com/cyberbotics/webots/releases/download/${WEBOTS_NIGHTLY_VERSION}/webots_${WEBOTS_RELEASE_VERSION}_amd64.deb -O /tmp/webots.deb
 apt install -y /tmp/webots.deb xvfb
 

diff --git a/webots_ros2_driver/CMakeLists.txt b/webots_ros2_driver/CMakeLists.txt
@@ -28,6 +28,7 @@ find_package(vision_msgs REQUIRED)
 find_package(webots_ros2_msgs REQUIRED)
 find_package(tinyxml2_vendor REQUIRED)
 find_package(TinyXML2 REQUIRED)
+find_package(yaml-cpp REQUIRED)
 find_package(PythonLibs 3.10 EXACT REQUIRED)
 
 add_custom_target(compile-lib-controller ALL

diff --git a/webots_ros2_driver/package.xml b/webots_ros2_driver/package.xml
@@ -27,6 +27,7 @@
   <depend>tinyxml2_vendor</depend>
   <depend>webots_ros2_msgs</depend>
   <depend>webots_ros2_importer</depend>
+  <depend>yaml-cpp</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>