Skip to content

Commit 7bdc58c

Browse files
nkoenigNate Koenigchapulina
authored
Change IGN_DESIGNATION to GZ_DESIGNATION (#282)
Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>
1 parent 5d07cbb commit 7bdc58c

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ project(ignition-msgs3 VERSION 3.2.0)
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 REQUIRED)
12+
find_package(ignition-cmake2 VERSION 2.13 REQUIRED)
1313

1414
#============================================================================
1515
# Configure the project

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/)

src/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ endif()
140140
set_source_files_properties(${gen_headers} ${gen_sources} ${gen_ruby_scripts}
141141
PROPERTIES GENERATED TRUE)
142142

143-
message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
144-
install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR})
143+
message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
144+
install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR})
145145

146146
ign_install_includes(
147-
"${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_DESIGNATION}"
147+
"${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${GZ_DESIGNATION}"
148148
${gen_headers})
149149

150150

@@ -159,8 +159,8 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/MessageTypes.hh.in
159159
${PROJECT_BINARY_DIR}/include/ignition/msgs/MessageTypes.hh)
160160

161161
ign_install_includes(
162-
"${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_DESIGNATION}"
163-
"${PROJECT_BINARY_DIR}/include/ignition/${IGN_DESIGNATION}/MessageTypes.hh")
162+
"${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${GZ_DESIGNATION}"
163+
"${PROJECT_BINARY_DIR}/include/ignition/${GZ_DESIGNATION}/MessageTypes.hh")
164164

165165

166166
##################################################

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

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)