Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change IGN_DESIGNATION to GZ_DESIGNATION #468

Merged
merged 2 commits into from
Jul 23, 2022
Merged

Change IGN_DESIGNATION to GZ_DESIGNATION #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c11c19b
Change IGN_DESIGNATION to GZ_DESIGNATION
Jul 20, 2022
12b3dd1
Merge branch 'ign-math6' into gz-designation
scpeters Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api.md.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of
libraries designed to rapidly develop robot and simulation applications.
This library defines a general set of math classes and functions with an eye
toward simulation and robotics.
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/math/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Exclude the detail directory from inclusion. The purpose is to prevent the detail/* header files from being included in math.hh. A side effect is that the detail headers are not installed. The next install line solves this problem.
ign_install_all_headers(EXCLUDE_DIRS detail)
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION})
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${GZ_DESIGNATION})
2 changes: 1 addition & 1 deletion include/ignition/math/config.hh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#define IGNITION_MATH_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}

#define IGNITION_MATH_VERSION_HEADER "Ignition ${IGN_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
#define IGNITION_MATH_VERSION_HEADER "Ignition ${GZ_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2014 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"

#cmakedefine IGNITION_MATH_BUILD_TYPE_PROFILE 1
#cmakedefine IGNITION_MATH_BUILD_TYPE_DEBUG 1
Expand Down
2 changes: 1 addition & 1 deletion test/integration/all_symbols_have_version.bash.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tutorials.md.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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**
Expand Down