Skip to content

Commit cb1c95b

Browse files
committed
7 ➡️ 8
Signed-off-by: Louise Poubel <louise@openrobotics.org>
2 parents f686929 + 80604c9 commit cb1c95b

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(ignition-transport8 VERSION 8.2.1)
99
# Find ignition-cmake
1010
#============================================================================
1111
# If you get an error at this line, you need to install ignition-cmake
12-
find_package(ignition-cmake2 2.8.0 REQUIRED)
12+
find_package(ignition-cmake2 2.13 REQUIRED)
1313
set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
1414

1515
#============================================================================

api.md.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## Ignition @IGN_DESIGNATION_CAP@
1+
## Ignition @GZ_DESIGNATION_CAP@
22

3-
Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
3+
Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
44
designed to rapidly develop robot and simulation applications.
55

66
## License

conf/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Used only for internal testing.
2-
set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
2+
set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
33

44
# Generate a configuration file for internal testing.
55
# Note that the major version of the library is included in the name.
66
# Ex: transport0.yaml
77
configure_file(
8-
"${IGN_DESIGNATION}.yaml.in"
9-
"${CMAKE_BINARY_DIR}/test/conf/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
8+
"${GZ_DESIGNATION}.yaml.in"
9+
"${CMAKE_BINARY_DIR}/test/conf/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
1010

1111
# Used for the installed version.
12-
set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
12+
set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
1313

1414
# Generate the configuration file that is installed.
1515
# Note that the major version of the library is included in the name.
1616
# Ex: transport0.yaml
1717
configure_file(
18-
"${IGN_DESIGNATION}.yaml.in"
19-
"${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
18+
"${GZ_DESIGNATION}.yaml.in"
19+
"${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml" @ONLY)
2020

2121
# Install the yaml configuration files in an unversioned location.
22-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml
22+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml
2323
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/ignition/)

include/ignition/transport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# that the detail headers are not installed. The next install line solves this
44
# problem.
55
ign_install_all_headers(EXCLUDE_DIRS detail)
6-
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${IGN_DESIGNATION})
6+
install(DIRECTORY detail DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}/ignition/${GZ_DESIGNATION})

include/ignition/transport/config.hh.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Config.hh. Generated by CMake for @PROJECT_NAME@. */
22

3-
#ifndef IGNITION_${IGN_DESIGNATION_UPPER}_CONFIG_HH_
4-
#define IGNITION_${IGN_DESIGNATION_UPPER}_CONFIG_HH_
3+
#ifndef IGNITION_${GZ_DESIGNATION_UPPER}_CONFIG_HH_
4+
#define IGNITION_${GZ_DESIGNATION_UPPER}_CONFIG_HH_
55

66
/* Version number */
77
#define IGNITION_TRANSPORT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
@@ -13,7 +13,7 @@
1313

1414
#define IGNITION_TRANSPORT_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}
1515

16-
#define IGNITION_TRANSPORT_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"
16+
#define IGNITION_TRANSPORT_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"
1717

1818
#cmakedefine BUILD_TYPE_PROFILE 1
1919
#cmakedefine BUILD_TYPE_DEBUG 1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Automatically generated
2-
#include <ignition/${IGN_DESIGNATION}/config.hh>
2+
#include <ignition/${GZ_DESIGNATION}/config.hh>
33
${ign_headers}

src/cmd/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# Generate the ruby script for internal testing.
33
# Note that the major version of the library is included in the name.
44
# Ex: cmdtransport0.rb
5-
set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
5+
set(cmd_script_generated_test "${CMAKE_BINARY_DIR}/test/lib/ruby/ignition/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
66
set(cmd_script_configured_test "${cmd_script_generated_test}.configured")
77

88
# Set the library_location variable to the full path of the library file within
99
# the build directory.
1010
set(library_location "$<TARGET_FILE:${PROJECT_LIBRARY_TARGET_NAME}>")
1111

1212
configure_file(
13-
"cmd${IGN_DESIGNATION}.rb.in"
13+
"cmd${GZ_DESIGNATION}.rb.in"
1414
"${cmd_script_configured_test}"
1515
@ONLY)
1616

@@ -24,15 +24,15 @@ file(GENERATE
2424
# Generate the ruby script that gets installed.
2525
# Note that the major version of the library is included in the name.
2626
# Ex: cmdtransport0.rb
27-
set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
27+
set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb")
2828
set(cmd_script_configured "${cmd_script_generated}.configured")
2929

3030
# Set the library_location variable to the relative path to the library file
3131
# within the install directory structure.
3232
set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:${PROJECT_LIBRARY_TARGET_NAME}>")
3333

3434
configure_file(
35-
"cmd${IGN_DESIGNATION}.rb.in"
35+
"cmd${GZ_DESIGNATION}.rb.in"
3636
"${cmd_script_configured}"
3737
@ONLY)
3838

test/integration/all_symbols_have_version.bash.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
LIBPATH=$1
44
VERSIONED_NS=v@PROJECT_VERSION_MAJOR@
5-
IGN_PROJECT=@IGN_DESIGNATION@
5+
IGN_PROJECT=@GZ_DESIGNATION@
66

77
# Sanity check - there should be at least one symbol
88
NUM_SYMBOLS=$(nm $LIBPATH | grep -e "ignition.*$IGN_PROJECT" | wc -l)

tutorials.md.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
\page tutorials Tutorials
22

3-
Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials
3+
Welcome to the Ignition @GZ_DESIGNATION_CAP@ tutorials. These tutorials
44
will guide you through the process of understanding the capabilities of the
5-
Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
5+
Ignition @GZ_DESIGNATION_CAP@ library and how to use the library effectively.
66

77
**The tutorials**
88

0 commit comments

Comments
 (0)