Merge branch 'main' into bump_main_11.0.0

scpeters · web-flow · commit b68fdcf9c80a · 2026-03-12T13:38:56.000-07:00
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -152,7 +152,7 @@ endif()
 
 # Plugin install dirs
 set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR
-  ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
+  ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}/engine-plugins
 )
 
 set(GZ_RENDERING_ENGINE_INSTALL_DIR
diff --git a/package.xml b/package.xml
@@ -17,7 +17,6 @@
   <depend>gz-math</depend>
   <depend>gz-plugin</depend>
   <depend>gz-utils</depend>
-  <depend>libfreeimage-dev</depend>
   <depend>libglew-dev</depend>
   <depend>libogre-dev</depend>
   <depend>libogre-next-2.3-dev</depend>

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ endif()`
`152`	`152`
`153`	`153`	`# Plugin install dirs`
`154`	`154`	`set(GZ_RENDERING_ENGINE_RELATIVE_INSTALL_DIR`
`155`		`- ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins`
	`155`	`+ ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}/engine-plugins`
`156`	`156`	`)`
`157`	`157`
`158`	`158`	`set(GZ_RENDERING_ENGINE_INSTALL_DIR`