From 20acd2444fa3188aca59c906c88dcf65e61d3ee3 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 20 Jul 2022 08:10:04 -0700 Subject: [PATCH 1/3] Change IGN_DESIGNATION to GZ_DESIGNATION Signed-off-by: Nate Koenig --- api.md.in | 4 ++-- include/ignition/gui/config.hh.in | 4 ++-- include/ignition/gui/ign_auto_headers.hh.in | 2 +- include/ignition/gui/plugins/CMakeLists.txt | 2 +- tutorials.md.in | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api.md.in b/api.md.in index d25ca9164..31af86575 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/gui/config.hh.in b/include/ignition/gui/config.hh.in index d2f3445e0..e439764c9 100644 --- a/include/ignition/gui/config.hh.in +++ b/include/ignition/gui/config.hh.in @@ -8,10 +8,10 @@ #define IGNITION_GUI_VERSION "${PROJECT_VERSION}" #define IGNITION_GUI_VERSION_FULL "${PROJECT_VERSION_FULL}" -#define IGNITION_GUI_VERSION_HEADER "Ignition ${IGN_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" +#define IGNITION_GUI_VERSION_HEADER "Ignition ${GZ_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #cmakedefine BUILD_TYPE_PROFILE 1 #cmakedefine BUILD_TYPE_DEBUG 1 #cmakedefine BUILD_TYPE_RELEASE 1 -#define IGN_GUI_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins" +#define IGN_GUI_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins" diff --git a/include/ignition/gui/ign_auto_headers.hh.in b/include/ignition/gui/ign_auto_headers.hh.in index 62156f5f5..a92282ee3 100644 --- a/include/ignition/gui/ign_auto_headers.hh.in +++ b/include/ignition/gui/ign_auto_headers.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} diff --git a/include/ignition/gui/plugins/CMakeLists.txt b/include/ignition/gui/plugins/CMakeLists.txt index 7d17722b5..fbbe77055 100644 --- a/include/ignition/gui/plugins/CMakeLists.txt +++ b/include/ignition/gui/plugins/CMakeLists.txt @@ -9,7 +9,7 @@ set (qt_headers_local ) set(IGNITION_GUI_PLUGIN_INSTALL_DIR - ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins + ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins ) # Plugin shared libraries diff --git a/tutorials.md.in b/tutorials.md.in index c321caeee..9db6c7d2a 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 74dce0bd5e652215cff1ee56fa19bbb6a8afbcb3 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 22 Jul 2022 21:35:16 -0700 Subject: [PATCH 2/3] 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 79f581687..1e4ef858f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-gui1 VERSION 1.0.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 REQUIRED) +find_package(ignition-cmake2 VERSION 2.13 REQUIRED) #============================================================================ # Configure the project From ac37a586be927f5c9b87ebd442b28b485ace30b7 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 22 Jul 2022 21:43:26 -0700 Subject: [PATCH 3/3] remove VERSION Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e4ef858f..d5b47abe2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-gui1 VERSION 1.0.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 VERSION 2.13 REQUIRED) +find_package(ignition-cmake2 2.13 REQUIRED) #============================================================================ # Configure the project