File tree Expand file tree Collapse file tree 9 files changed +22
-22
lines changed
include/ignition/transport Expand file tree Collapse file tree 9 files changed +22
-22
lines changed Original file line number Diff line number Diff 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)
1313set (IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
1414
1515#============================================================================
Original file line number Diff line number Diff line change 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
44designed to rapidly develop robot and simulation applications.
55
66## License
Original file line number Diff line number Diff line change 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
77configure_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
1717configure_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/)
Original file line number Diff line number Diff line change 33# that the detail headers are not installed. The next install line solves this
44# problem.
55ign_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 } )
Original file line number Diff line number Diff line change 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}
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
Original file line number Diff line number Diff line change 11// Automatically generated
2- #include <ignition/${IGN_DESIGNATION }/config.hh>
2+ #include <ignition/${GZ_DESIGNATION }/config.hh>
33${ign_headers}
Original file line number Diff line number Diff line change 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" )
66set (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.
1010set (library_location "$<TARGET_FILE:${PROJECT_LIBRARY_TARGET_NAME} >" )
1111
1212configure_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" )
2828set (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.
3232set (library_location "../../../${CMAKE_INSTALL_LIBDIR} /$<TARGET_FILE_NAME:${PROJECT_LIBRARY_TARGET_NAME} >" )
3333
3434configure_file (
35- "cmd${IGN_DESIGNATION } .rb.in"
35+ "cmd${GZ_DESIGNATION } .rb.in"
3636 "${cmd_script_configured} "
3737 @ONLY)
3838
Original file line number Diff line number Diff line change 22
33LIBPATH=$1
44VERSIONED_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
88NUM_SYMBOLS=$(nm $LIBPATH | grep -e "ignition.*$IGN_PROJECT" | wc -l)
Original file line number Diff line number Diff line change 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
44will 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
You can’t perform that action at this time.
0 commit comments