Merge remote-tracking branch 'origin/gz-plugin2' into package_xml

gazebosim · Apr 8, 2024 · dfd3867 · dfd3867
2 parents 58d2e4e + 23c28a2
commit dfd3867
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-plugin2 VERSION 2.0.2)
+project(gz-plugin2 VERSION 2.0.3)
 
 #============================================================================
 # Find gz-cmake

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,26 @@
 ## Gazebo Plugin 2.x
 
+### Gazebo Plugin 2.0.3 (2024-04-08)
+
+1. Use relative install path for gz tool data
+    * [Pull request #140](https://github.com/gazebosim/gz-plugin/pull/140)
+
+1. Remove @mxgrey as codeowner and assign maintainership to @ahcorde
+    * [Pull request #137](https://github.com/gazebosim/gz-plugin/pull/137)
+
+1. Update CI badges in README
+    * [Pull request #134](https://github.com/gazebosim/gz-plugin/pull/134)
+
+1. Infrastructure
+    * [Pull request #132](https://github.com/gazebosim/gz-plugin/pull/132)
+
+1. Enable and fix gz test on windows
+    * [Pull request #128](https://github.com/gazebosim/gz-plugin/pull/128)
+    * [Pull request #131](https://github.com/gazebosim/gz-plugin/pull/131)
+
+1. Do not install CMakeLists.txt in loader/register
+    * [Pull request #123](https://github.com/gazebosim/gz-plugin/pull/123)
+
 ### Gazebo Plugin 2.0.2 (2023-09-26)
 
 1. Add explicit dependency on plugin library

diff --git a/loader/conf/CMakeLists.txt b/loader/conf/CMakeLists.txt
@@ -24,7 +24,7 @@ configure_file(
 
 # Install the yaml configuration files in an unversioned location.
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/)
+  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gz/)
 
 # Tack version onto and install the bash completion script
 configure_file(
@@ -34,4 +34,4 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/plugin${PROJECT_VERSION_MAJOR}.bash_completion.sh
   DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${GZ_TOOLS_VER}.completion.d)
+    ${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${GZ_TOOLS_VER}.completion.d)