Merge branch 'main' into bump_main_10

gazebosim · Oct 11, 2024 · 3e5da51 · 3e5da51
2 parents 21566ee + 589abd3
commit 3e5da51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -39,10 +39,10 @@ jobs:
 
     - name: Build Dependencies
       run: |
-        pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF  --event-handlers console_direct+ --packages-up-to ${env:PACKAGE}
+        pixi run colcon build --merge-install --cmake-args " -GVisual Studio 17 2022" " -A x64" " -DCMAKE_BUILD_TYPE=Release" " -DBUILD_TESTING=OFF" --event-handlers console_direct+ --packages-up-to ${env:PACKAGE}
 
     - name: Build Package
-      run: pixi run colcon build --merge-install --cmake-args -G"Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DSKIP_ogre=ON --event-handlers console_direct+ --packages-select ${env:PACKAGE}
+      run: pixi run colcon build --merge-install --cmake-args " -GVisual Studio 17 2022" " -A x64" " -DCMAKE_BUILD_TYPE=Release" " -DBUILD_TESTING=ON" " -DSKIP_ogre=ON" --event-handlers console_direct+ --packages-select ${env:PACKAGE}
 
     - name: Test
       run: pixi run colcon test --merge-install --event-handlers console_direct+ --packages-select ${env:PACKAGE}
diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc
@@ -563,14 +563,10 @@ bool RenderEngineManagerPrivate::UnloadEnginePlugin(
   std::string pluginName = it->second;
   this->enginePlugins.erase(it);
 
-#ifndef _WIN32
-  // Unloading the plugin on windows causes tests to crash on exit
-  // see issue #45
   if (!this->pluginLoader.ForgetLibraryOfPlugin(pluginName))
   {
     gzerr << "Failed to unload plugin: " << pluginName << std::endl;
   }
-#endif
 
   std::lock_guard<std::recursive_mutex> lock(this->enginesMutex);
   auto engineIt = this->engines.find(_engineName);

diff --git a/test/gz_rendering_test.cmake b/test/gz_rendering_test.cmake
@@ -81,6 +81,11 @@ macro(gz_configure_rendering_test)
       APPEND PROPERTY
         ENVIRONMENT "GZ_ENGINE_BACKEND=${gz_configure_rendering_test_RENDER_ENGINE_BACKEND}")
 
+  set_property(
+      TEST ${test_name}
+      APPEND PROPERTY
+        ENVIRONMENT "GZ_RENDERING_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+
   if(gz_configure_rendering_test_HEADLESS)
     set_property(
         TEST ${test_name}