From 8e82cd5cfa3d471bbb1f115b266ba3bbc57c93c2 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 9 Aug 2022 12:17:25 -0700 Subject: [PATCH] Forward-port updates (#1633) Signed-off-by: Louise Poubel --- Migration.md | 2 +- examples/plugin/custom_sensor_system/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Migration.md b/Migration.md index 467c930b09b..298ae2c31b4 100644 --- a/Migration.md +++ b/Migration.md @@ -116,7 +116,7 @@ since pose information is being logged in the `changed_state` topic. + `ViewAndle`: Move camera to preset angles * The `gui.config` and `server.config` files are now located in a versioned - folder inside `$HOME/.ignition/gazebo`, i.e. `$HOME/.ignition/gazebo/6/gui.config`. + folder inside `$HOME/.gz/sim`, i.e. `$HOME/.gz/sim/6/gui.config`. * The `Component::Clone` method has been marked `const` to reflect that it should not mutate internal component state. Component implementations that diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt index bcb45f88262..820f3e7038b 100644 --- a/examples/plugin/custom_sensor_system/CMakeLists.txt +++ b/examples/plugin/custom_sensor_system/CMakeLists.txt @@ -20,7 +20,7 @@ include(FetchContent) FetchContent_Declare( sensors_clone GIT_REPOSITORY https://github.com/gazebosim/gz-sensors - GIT_TAG main + GIT_TAG gz-sensors7 ) FetchContent_Populate(sensors_clone) add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})