Merge remote-tracking branch 'origin/gz-gui8' into azeey/package_xml

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-gui8 VERSION 8.1.0)
+project(gz-gui8 VERSION 8.1.1)
 
 #============================================================================
 # Find gz-cmake

Changelog.md

@@ -1,5 +1,13 @@
 ## Gazebo GUI 8
 
+### Gazebo GUI 8.1.1 (2024-04-10)
+
+1. Fix compiler warnings in GCC-13 (Noble)
+    * [Pull request #616](https://github.com/gazebosim/gz-gui/pull/616)
+
+1. Use relative install paths for plugin shared libraries and gz-tools data
+    * [Pull request #614](https://github.com/gazebosim/gz-gui/pull/614)
+
 ### Gazebo GUI 8.1.0 (2024-03-14)
 
 1. Update CI badges in README

conf/CMakeLists.txt

@@ -20,4 +20,4 @@ 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/)

doc/CMakeLists.txt

@@ -25,5 +25,5 @@ if (DOXYGEN_FOUND)
     COMMENT "Generating API documentation with Doxygen" VERBATIM)
 
   install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml 
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
+    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
 endif()

src/cmd/CMakeLists.txt

@@ -51,4 +51,4 @@ install(
   FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gui${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)

src/plugins/CMakeLists.txt

@@ -110,7 +110,7 @@ function(gz_gui_add_plugin plugin_name)
         COMPILE_FLAGS "/wd4251")
   endif()
 
-  install (TARGETS ${plugin_name} DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})
+  install (TARGETS ${plugin_name} DESTINATION ${GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR})
 endfunction()
 
 # Plugins

src/plugins/grid_config/CMakeLists.txt

@@ -11,4 +11,4 @@ gz_gui_add_plugin(GridConfig
 install (
   FILES $<TARGET_FILE:GridConfig>
   RENAME ${CMAKE_SHARED_LIBRARY_PREFIX}Grid3D${CMAKE_SHARED_LIBRARY_SUFFIX}
-  DESTINATION ${GZ_GUI_PLUGIN_INSTALL_DIR})
+  DESTINATION ${GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR})

src/plugins/image_display/ImageDisplay_TEST.cc

@@ -269,7 +269,7 @@ TEST(ImageDisplayTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(ReceiveImage))
 
     // red image
     int bufferSize = msg.width() * msg.height() * bpp;
-    std::shared_ptr<unsigned char> buffer(new unsigned char[bufferSize]);
+    std::shared_ptr<unsigned char[]> buffer(new unsigned char[bufferSize]);
     for (int i = 0; i < bufferSize; i += bpp)
     {
       buffer.get()[i] = 255u;
@@ -371,7 +371,7 @@ TEST(ImageDisplayTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(ReceiveImageFloat32))
 
     // first half is gray, second half is black
     int bufferSize = msg.width() * msg.height() * bpp;
-    std::shared_ptr<float> buffer(new float[bufferSize]);
+    std::shared_ptr<float[]> buffer(new float[bufferSize]);
     for (unsigned int y = 0; y < msg.width(); ++y)
     {
       float v = 0.5f * static_cast<int>(y / (msg.height() / 2.0) + 1);
@@ -485,7 +485,7 @@ TEST(ImageDisplayTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(ReceiveImageInt16))
 
     // first half is black, second half is white
     int bufferSize = msg.width() * msg.height() * bpp;
-    std::shared_ptr<uint16_t> buffer(new uint16_t[bufferSize]);
+    std::shared_ptr<uint16_t[]> buffer(new uint16_t[bufferSize]);
     for (unsigned int y = 0; y < msg.width(); ++y)
     {
       uint16_t v = 100 * static_cast<int>(y / (msg.height() / 2.0) + 1);