Merge branch 'gz-sim8' into scpeters/merge_8_main

gazebosim · Nov 13, 2023 · c69eb67 · c69eb67
2 parents efc3bed + a30dfff
commit c69eb67
Show file tree

Hide file tree

Showing 75 changed files with 3,456 additions and 1,084 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -23,6 +23,7 @@ libsdformat15-dev
 libtinyxml2-dev
 libxi-dev
 libxmu-dev
+libpython3-dev
 python3-distutils
 python3-gz-math8
 python3-gz-msgs11

diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt
@@ -20,7 +20,7 @@ include(FetchContent)
 FetchContent_Declare(
   sensors_clone
   GIT_REPOSITORY https://github.com/gazebosim/gz-sensors
-  GIT_TAG main
+  GIT_TAG gz-sensors8
 )
 FetchContent_Populate(sensors_clone)
 add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})

diff --git a/examples/standalone/marker/marker.cc b/examples/standalone/marker/marker.cc
@@ -172,7 +172,7 @@ int main(int _argc, char **_argv)
   gz::msgs::Set(markerMsg.add_point(),
         gz::math::Vector3d(0, 0, 0.05));
   double radius = 2;
-  for (double t = 0; t <= M_PI; t+= 0.01)
+  for (double t = 0; t <= GZ_PI; t+= 0.01)
   {
     gz::msgs::Set(markerMsg.add_point(),
         gz::math::Vector3d(radius * cos(t), radius * sin(t), 0.05));

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)