From 53bcc7fe773d985c6d184276890912ea15e785ac Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 29 Dec 2021 14:59:15 -0800 Subject: [PATCH] Bumps in garden: ign-math7, ign-common5, sdformat13 (#183) Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 6 +++--- CMakeLists.txt | 12 ++++++------ include/ignition/sensors/ForceTorqueSensor.hh | 1 - include/ignition/sensors/SegmentationCameraSensor.hh | 1 - src/Sensor_TEST.cc | 1 - 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index a5db8d4a..c9aebda5 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,9 +1,9 @@ libignition-cmake2-dev -libignition-common4-dev -libignition-math6-dev +libignition-common5-dev +libignition-math7-dev libignition-msgs9-dev libignition-rendering7-dev libignition-tools-dev libignition-transport12-dev -libsdformat12-dev +libsdformat13-dev xvfb diff --git a/CMakeLists.txt b/CMakeLists.txt index 96bd9242..abe20549 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,15 +43,15 @@ ign_find_package(IgnProtobuf #-------------------------------------- # Find ignition-math -ign_find_package(ignition-math6 REQUIRED VERSION 6.6) -set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) +ign_find_package(ignition-math7 REQUIRED) +set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR}) #-------------------------------------- # Find ignition-common -ign_find_package(ignition-common4 +ign_find_package(ignition-common5 COMPONENTS profiler REQUIRED) -set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) +set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR}) #-------------------------------------- # Find ignition-transport @@ -80,8 +80,8 @@ set(IGN_MSGS_VER ${ignition-msgs9_VERSION_MAJOR}) #-------------------------------------- # Find SDFormat -ign_find_package(sdformat12 REQUIRED) -set(SDF_VER ${sdformat12_VERSION_MAJOR}) +ign_find_package(sdformat13 REQUIRED) +set(SDF_VER ${sdformat13_VERSION_MAJOR}) set(IGN_SENSORS_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) diff --git a/include/ignition/sensors/ForceTorqueSensor.hh b/include/ignition/sensors/ForceTorqueSensor.hh index 303b51dc..5ff0f439 100644 --- a/include/ignition/sensors/ForceTorqueSensor.hh +++ b/include/ignition/sensors/ForceTorqueSensor.hh @@ -23,7 +23,6 @@ #include #include -#include #include diff --git a/include/ignition/sensors/SegmentationCameraSensor.hh b/include/ignition/sensors/SegmentationCameraSensor.hh index 9e04bc7d..80ea4ae8 100644 --- a/include/ignition/sensors/SegmentationCameraSensor.hh +++ b/include/ignition/sensors/SegmentationCameraSensor.hh @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Sensor_TEST.cc b/src/Sensor_TEST.cc index 98ff7d7e..603f178d 100644 --- a/src/Sensor_TEST.cc +++ b/src/Sensor_TEST.cc @@ -31,7 +31,6 @@ #endif #include -#include #include #include #include