From 748e55d30cce8bda08416ee8f8f1c3d4f5be8133 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 20 Jul 2022 08:25:50 -0700 Subject: [PATCH 1/2] Change IGN_DESIGNATION to GZ_DESIGNATION Signed-off-by: Nate Koenig --- api.md.in | 4 ++-- include/ignition/sensors/config.hh.in | 2 +- test/integration/all_symbols_have_version.bash.in | 2 +- tutorials.md.in | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api.md.in b/api.md.in index d25ca916..31af8657 100644 --- 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 index 14b69ffb..d4f22ead 100644 --- 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 index 9be67a78..07c9ac21 100644 --- 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 index 9950f3c2..da9367f7 100644 --- 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** From 351fb6b08f0960a36b9e93f731b7ca6fc893b729 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 22 Jul 2022 21:56:42 -0700 Subject: [PATCH 2/2] Require gz-cmake 2.13 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c73b6927..e706b814 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-sensors1 VERSION 1.0.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 REQUIRED) +find_package(ignition-cmake2 2.13 REQUIRED) #============================================================================ # Configure the project