Merge branch 'gz-sim7' into ports/7_to_8

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Nov 2, 2023 · 94a1802 · 94a1802
2 parents d693df6 + b8d1679
commit 94a1802
Show file tree

Hide file tree

Showing 19 changed files with 2,513 additions and 320 deletions.
diff --git a/examples/worlds/CMakeLists.txt b/examples/worlds/CMakeLists.txt
@@ -2,4 +2,8 @@ file(GLOB files "*.sdf")
 install(FILES ${files}
  DESTINATION ${GZ_DATA_INSTALL_DIR}/worlds)
 
+file(GLOB csv_files "*.csv")
+install(FILES ${csv_files}
+ DESTINATION ${GZ_DATA_INSTALL_DIR}/worlds)
+
 add_subdirectory(thumbnails)