From 19ca21e706eafa28e1338b73e34e5cec01428b80 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Fri, 22 Jul 2022 21:43:06 -0700 Subject: [PATCH] Change IGN_DESIGNATION to GZ_DESIGNATION (#278) Signed-off-by: Nate Koenig Signed-off-by: Louise Poubel Co-authored-by: Nate Koenig Co-authored-by: Louise Poubel --- CMakeLists.txt | 2 +- api.md.in | 4 ++-- conf/CMakeLists.txt | 2 +- include/ignition/fuel_tools/config.hh.in | 2 +- tutorials.md.in | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb66e1bc..7c2b8608 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(ignition-fuel_tools3 VERSION 3.5.0) # Find ignition-cmake #============================================================================ # If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake2 2.3 REQUIRED) +find_package(ignition-cmake2 2.13 REQUIRED) set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #============================================================================ 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/conf/CMakeLists.txt b/conf/CMakeLists.txt index f7c8d22d..d83abd5e 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -21,4 +21,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fuel${PROJECT_VERSION_MAJOR}.yaml DEST # Install config.yaml install (FILES config.yaml DESTINATION - ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/) + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/) diff --git a/include/ignition/fuel_tools/config.hh.in b/include/ignition/fuel_tools/config.hh.in index b7c2a388..303283a9 100644 --- a/include/ignition/fuel_tools/config.hh.in +++ b/include/ignition/fuel_tools/config.hh.in @@ -10,7 +10,7 @@ #define IGNITION_FUEL_TOOLS_VERSION_HEADER "${PROJECT_NAME_LOWER}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" -#define IGNITION_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/" +#define IGNITION_FUEL_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}/" #cmakedefine BUILD_TYPE_PROFILE 1 #cmakedefine BUILD_TYPE_DEBUG 1 diff --git a/tutorials.md.in b/tutorials.md.in index ea64fc3f..db518696 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**