From fb3f3d43eee648e387f89d611dd2a9973fff201e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 25 Apr 2024 16:44:34 -0500 Subject: [PATCH 1/4] Fix namespace and class links in documentation references that use namespace `gz` (#2385) The `gz` namespace is not recognized by doxygen enough for it to autogenerate links to inner namespaces and classes. For example, `\ref gz::sim::systems` or simply `gz::sim::systems` don't link to the namespace documentation. You'd have to use `ignition::gazebo::systems` instead. I was hoping there was a more clever solution that would allow all `gz::` refs to work automatically, but I was not able to find one, so this is a compromise to fix the landing page for ign-gazebo6 (https://gazebosim.org/api/sim/6) Signed-off-by: Addisu Z. Taddese --- api.md.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api.md.in b/api.md.in index 43eb2ebe20..066b311269 100644 --- a/api.md.in +++ b/api.md.in @@ -5,10 +5,10 @@ designed to rapidly develop robot and simulation applications. **Useful links** -1. gz::sim::components : List of built-in Component types. Components represent data, such as position information, that can be added to an Entity. -2. gz::sim::systems : List of available Systems. A System operates on Entities that have a specific set of Components. -3. gz::sim::events : List of simulation events. See the - gz::sim::EventManager for details about events and how to use them. +1. [gz::sim::components](\ref ignition::gazebo::components) : List of built-in Component types. Components represent data, such as position information, that can be added to an Entity. +2. [gz::sim::systems](\ref ignition::gazebo::systems) : List of available Systems. A System operates on Entities that have a specific set of Components. +3. [gz::sim::events](\ref ignition::gazebo::events) : List of simulation events. See the + [gz::sim::EventManager](\ref ignition::gazebo::EventManager) for details about events and how to use them. ## License From 0b4585a7735fe517bcd0caac0d484840adb44dfb Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 29 May 2024 10:04:36 -0700 Subject: [PATCH 2/4] Rephrase cmake comment about CMP0077 (#2419) Signed-off-by: Steve Peters --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e85730863b..d287de59aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ option(USE_DIST_PACKAGES_FOR_PYTHON #============================================================================ # Setting this policy enables using the protobuf_MODULE_COMPATIBLE -# set command in CMake versions older than 13.13 +# set command when cmake_minimum_required is less than 3.13 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) # This option is needed to use the PROTOBUF_GENERATE_CPP # in case protobuf is found with the CMake config files From 3c52690a085153961429d30307f1b72649365023 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 30 May 2024 10:16:39 -0700 Subject: [PATCH 3/4] Use VERSION_GREATER_EQUAL in cmake logic (#2418) Signed-off-by: Steve Peters --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 157c55ea0a..8a81a7583d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -255,7 +255,7 @@ foreach(CMD_TEST # to the PATH. This is done via the ENVIRONMENT_MODIFICATION that is only available # since CMake 3.22. However, if an older CMake is used another trick to install the libraries # beforehand - if (WIN32 AND CMAKE_VERSION STRGREATER "3.22") + if (WIN32 AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.22") set_tests_properties(${CMD_TEST} PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") endif() From bd1d057a80bcb7deb91c0ff40bfb35ed8edc3e41 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Fri, 31 May 2024 08:17:18 -0700 Subject: [PATCH 4/4] Remove a few extra zeros from some sdf files (#2426) Signed-off-by: Nate Koenig --- test/worlds/quadcopter.sdf | 8 ++++---- test/worlds/quadcopter_velocity_control.sdf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/worlds/quadcopter.sdf b/test/worlds/quadcopter.sdf index bc93489ee5..b45f431aa4 100644 --- a/test/worlds/quadcopter.sdf +++ b/test/worlds/quadcopter.sdf @@ -91,7 +91,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -136,7 +136,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -181,7 +181,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -226,7 +226,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 diff --git a/test/worlds/quadcopter_velocity_control.sdf b/test/worlds/quadcopter_velocity_control.sdf index 09390c0274..1650b5852c 100644 --- a/test/worlds/quadcopter_velocity_control.sdf +++ b/test/worlds/quadcopter_velocity_control.sdf @@ -91,7 +91,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -136,7 +136,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -181,7 +181,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2 @@ -226,7 +226,7 @@ - 0 0 0 1.57 0 0 0 + 0 0 0 1.57 0 0 0.2