From 297bbc65cb4a3b4317226f80386700ab0cc86cd2 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 20 Jul 2022 08:22:45 -0700 Subject: [PATCH 1/2] Change IGN_DESIGNATION to GZ_DESIGNATION Signed-off-by: Nate Koenig --- CMakeLists.txt | 2 +- api.md.in | 4 ++-- include/ignition/physics/config.hh.in | 14 +++++++------- tutorials.md.in | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 459a1e701..1cc7e43d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ set(IGNITION_PHYSICS_RESOURCE_DIR "${CMAKE_SOURCE_DIR}/resources") # Plugin install dirs set(IGNITION_PHYSICS_ENGINE_INSTALL_DIR - ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins + ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins ) #============================================================================ diff --git a/api.md.in b/api.md.in index 68bb55cb1..92ce8aff0 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/physics/config.hh.in b/include/ignition/physics/config.hh.in index 7dfc37317..a903f74a5 100644 --- a/include/ignition/physics/config.hh.in +++ b/include/ignition/physics/config.hh.in @@ -1,15 +1,15 @@ /* Config.hh. Generated by CMake for @PROJECT_NAME_NO_VERSION@. */ -#ifndef IGNITION_${IGN_DESIGNATION_UPPER}_CONFIG_HH_ -#define IGNITION_${IGN_DESIGNATION_UPPER}_CONFIG_HH_ +#ifndef IGNITION_${GZ_DESIGNATION_UPPER}_CONFIG_HH_ +#define IGNITION_${GZ_DESIGNATION_UPPER}_CONFIG_HH_ /* Version number */ -#define IGNITION_${IGN_DESIGNATION_UPPER}_MAJOR_VERSION ${PROJECT_VERSION_MAJOR} -#define IGNITION_${IGN_DESIGNATION_UPPER}_MINOR_VERSION ${PROJECT_VERSION_MINOR} -#define IGNITION_${IGN_DESIGNATION_UPPER}_PATCH_VERSION ${PROJECT_VERSION_PATCH} +#define IGNITION_${GZ_DESIGNATION_UPPER}_MAJOR_VERSION ${PROJECT_VERSION_MAJOR} +#define IGNITION_${GZ_DESIGNATION_UPPER}_MINOR_VERSION ${PROJECT_VERSION_MINOR} +#define IGNITION_${GZ_DESIGNATION_UPPER}_PATCH_VERSION ${PROJECT_VERSION_PATCH} -#define IGNITION_${IGN_DESIGNATION_UPPER}_VERSION "${PROJECT_VERSION}" -#define IGNITION_${IGN_DESIGNATION_UPPER}_VERSION_FULL "${PROJECT_VERSION_FULL}" +#define IGNITION_${GZ_DESIGNATION_UPPER}_VERSION "${PROJECT_VERSION}" +#define IGNITION_${GZ_DESIGNATION_UPPER}_VERSION_FULL "${PROJECT_VERSION_FULL}" #define IGNITION_PHYSICS_ENGINE_INSTALL_DIR "${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}" diff --git a/tutorials.md.in b/tutorials.md.in index f436a7423..0c2525387 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. **Contents** From 80c44d634261205673233e2de23755b5ee8e82f8 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 22 Jul 2022 21:40:19 -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 1cc7e43d3..addad8357 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-physics1 VERSION 1.10.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 2.1.0 REQUIRED) +find_package(ignition-cmake2 2.13.0 REQUIRED) #============================================================================ # Configure the project