Merge ign-sensors3 ➡️ ign-sensors6 (#252)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 1, 2022 · 329e30f · 329e30f
2 parents 31ffc18 + 20d0b7e
commit 329e30f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(ignition-sensors6 VERSION 6.6.0)
 #============================================================================
 # Find ignition-cmake
 #============================================================================
-find_package(ignition-cmake2 2.8.0 REQUIRED)
+find_package(ignition-cmake2 2.13 REQUIRED)
 
 #============================================================================
 # Configure the project

diff --git a/Changelog.md b/Changelog.md
@@ -337,6 +337,14 @@
 
 ## Ignition Sensors 2
 
+### Ignition Sensors 2.9.1 (2020-12-23)
+
+1. Fix version numbers in config.hh
+    * [Pull Request 42](https://github.com/ignitionrobotics/ign-sensors/pull/42)
+
+1. Resolve codecheck issues
+    * [Pull Request 57](https://github.com/ignitionrobotics/ign-sensors/pull/57)
+
 ### Ignition Sensors 2.9.0 (2020-08-07)
 
 1. Add noise to RGBD camera.

diff --git a/api.md.in b/api.md.in
@@ -1,6 +1,6 @@
-## Ignition @IGN_DESIGNATION_CAP@
+## Ignition @GZ_DESIGNATION_CAP@
 
-Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
+Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
 designed to rapidly develop robot and simulation applications. 
 
 ## License

diff --git a/include/ignition/sensors/config.hh.in b/include/ignition/sensors/config.hh.in
@@ -10,7 +10,7 @@
 
 #define IGNITION_SENSORS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}
 
-#define IGNITION_SENSORS_VERSION_HEADER "Ignition ${IGN_DESIGNATION_CAP}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
+#define IGNITION_SENSORS_VERSION_HEADER "Ignition ${GZ_DESIGNATION_CAP}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
 
 #cmakedefine BUILD_TYPE_PROFILE 1
 #cmakedefine BUILD_TYPE_DEBUG 1

diff --git a/test/integration/all_symbols_have_version.bash.in b/test/integration/all_symbols_have_version.bash.in
@@ -2,7 +2,7 @@
 
 LIBPATH=$1
 VERSIONED_NS=v@PROJECT_VERSION_MAJOR@
-IGN_PROJECT=@IGN_DESIGNATION@
+IGN_PROJECT=@GZ_DESIGNATION@
 
 # Sanity check - there should be at least one symbol
 NUM_SYMBOLS=$(nm $LIBPATH | grep -e "ignition.*$IGN_PROJECT" | wc -l)

diff --git a/tutorials.md.in b/tutorials.md.in
@@ -1,8 +1,8 @@
 \page tutorials Tutorials
 
-Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials
+Welcome to the Ignition @GZ_DESIGNATION_CAP@ tutorials. These tutorials
 will guide you through the process of understanding the capabilities of the
-Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
+Ignition @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
 
 **The tutorials**