Rename CMake project to gz

CMakeLists.txt

@@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-gazebo7 VERSION 7.0.0)
+project(gz-sim7 VERSION 7.0.0)
 
 #============================================================================
-# Find ignition-cmake
+# Find gz-cmake
 #============================================================================
-# If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake3 REQUIRED)
+# If you get an error at this line, you need to install gz-cmake
+find_package(gz-cmake3 REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -65,41 +65,41 @@ gz_find_package(sdformat13 REQUIRED)
 set(SDF_VER ${sdformat13_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-plugin
-gz_find_package(ignition-plugin2 REQUIRED COMPONENTS loader register)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+# Find gz-plugin
+gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-transport
-gz_find_package(ignition-transport12 REQUIRED COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport12_VERSION_MAJOR})
+# Find gz-transport
+gz_find_package(gz-transport12 REQUIRED COMPONENTS log)
+set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-msgs
-gz_find_package(ignition-msgs9 REQUIRED)
-set(IGN_MSGS_VER ${ignition-msgs9_VERSION_MAJOR})
+# Find gz-msgs
+gz_find_package(gz-msgs9 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs9_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-common
+# Find gz-common
 # Always use the profiler component to get the headers, regardless of status.
-gz_find_package(ignition-common5
+gz_find_package(gz-common5
   COMPONENTS
     profiler
     events
     av
   REQUIRED
 )
-set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
+set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-fuel_tools
-gz_find_package(ignition-fuel_tools8 REQUIRED)
-set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools8_VERSION_MAJOR})
+# Find gz-fuel_tools
+gz_find_package(gz-fuel_tools8 REQUIRED)
+set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools8_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-gui
-gz_find_package(ignition-gui7 REQUIRED)
-set(IGN_GUI_VER ${ignition-gui7_VERSION_MAJOR})
+# Find gz-gui
+gz_find_package(gz-gui7 REQUIRED)
+set(GZ_GUI_VER ${gz-gui7_VERSION_MAJOR})
 gz_find_package (Qt5
   COMPONENTS
     Core
@@ -109,19 +109,19 @@ gz_find_package (Qt5
   PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2")
 
 #--------------------------------------
-# Find ignition-physics
-gz_find_package(ignition-physics6
+# Find gz-physics
+gz_find_package(gz-physics6
   COMPONENTS
     heightmap
     mesh
     sdf
   REQUIRED
 )
-set(IGN_PHYSICS_VER ${ignition-physics6_VERSION_MAJOR})
+set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-sensors
-gz_find_package(ignition-sensors7 REQUIRED
+# Find gz-sensors
+gz_find_package(gz-sensors7 REQUIRED
   # component order is important
   COMPONENTS
     # non-rendering
@@ -146,17 +146,17 @@ gz_find_package(ignition-sensors7 REQUIRED
     thermal_camera
     wide_angle_camera
 )
-set(IGN_SENSORS_VER ${ignition-sensors7_VERSION_MAJOR})
+set(GZ_SENSORS_VER ${gz-sensors7_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-rendering
-gz_find_package(ignition-rendering7 REQUIRED)
-set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})
+# Find gz-rendering
+gz_find_package(gz-rendering7 REQUIRED)
+set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR})
 
 #--------------------------------------
-# Find ignition-math
-gz_find_package(ignition-math7 REQUIRED COMPONENTS eigen3)
-set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
+# Find gz-math
+gz_find_package(gz-math7 REQUIRED COMPONENTS eigen3)
+set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find if gz command is available
@@ -168,9 +168,9 @@ else()
 endif()
 
 #--------------------------------------
-# Find ignition-utils
-gz_find_package(ignition-utils2 REQUIRED COMPONENTS cli)
-set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
+# Find gz-utils
+gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
+set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find protobuf
@@ -180,7 +180,7 @@ gz_find_package(IgnProtobuf
                  REQUIRED
                  COMPONENTS all
                  PRETTY Protobuf)
-set(Protobuf_IMPORT_DIRS ${ignition-msgs9_INCLUDE_DIRS})
+set(Protobuf_IMPORT_DIRS ${gz-msgs9_INCLUDE_DIRS})
 
 #--------------------------------------
 # Find python
@@ -244,13 +244,13 @@ if (NOT APPLE)
     ADDITIONAL_INPUT_DIRS "${CMAKE_SOURCE_DIR}/src/systems ${CMAKE_SOURCE_DIR}/src/gui/plugins"
     IMAGE_PATH_DIRS "${CMAKE_SOURCE_DIR}/tutorials/files"
     TAGFILES
-     "${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
-     "${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}"
-     "${IGNITION-PHYSICS_DOXYGEN_TAGFILE} = ${IGNITION-PHYSICS_API_URL}"
-     "${IGNITION-PLUGIN_DOXYGEN_TAGFILE} = ${IGNITION-PLUGIN_API_URL}"
-     "${IGNITION-TRANSPORT_DOXYGEN_TAGFILE} = ${IGNITION-TRANSPORT_API_URL}"
-     "${IGNITION-SENSORS_DOXYGEN_TAGFILE} = ${IGNITION-SENSORS_API_URL}"
-     "${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}"
+     "${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}"
+     "${GZ-MSGS_DOXYGEN_TAGFILE} = ${GZ-MSGS_API_URL}"
+     "${GZ-PHYSICS_DOXYGEN_TAGFILE} = ${GZ-PHYSICS_API_URL}"
+     "${GZ-PLUGIN_DOXYGEN_TAGFILE} = ${GZ-PLUGIN_API_URL}"
+     "${GZ-TRANSPORT_DOXYGEN_TAGFILE} = ${GZ-TRANSPORT_API_URL}"
+     "${GZ-SENSORS_DOXYGEN_TAGFILE} = ${GZ-SENSORS_API_URL}"
+     "${GZ-COMMON_DOXYGEN_TAGFILE} = ${GZ-COMMON_API_URL}"
   )
 endif()
 

Changelog.md

@@ -614,7 +614,7 @@
 1. Examples and tutorial on using rendering API from plugins
     * [Pull request #596](https://github.com/gazebosim/gz-sim/pull/596)
 
-1.  Add missing GZ_GAZEBO_VISIBLE macros
+1.  Add missing GZ_SIM_VISIBLE macros
     * [Pull request #563](https://github.com/gazebosim/gz-sim/pull/563)
 
 1. Fix visibility macro names when used by a different component (Windows)
@@ -1299,7 +1299,7 @@
 1. Use common::setenv for portability to Windows
     * [Pull request #561](https://github.com/gazebosim/gz-sim/pull/561)
 
-1.  Add missing GZ_GAZEBO_VISIBLE macros
+1.  Add missing GZ_SIM_VISIBLE macros
     * [Pull request #563](https://github.com/gazebosim/gz-sim/pull/563)
 
 1. Fix deprecation warnings
@@ -2010,7 +2010,7 @@
 1. Examples and tutorial on using rendering API from plugins
     * [Pull request #596](https://github.com/gazebosim/gz-sim/pull/596)
 
-1.  Add missing GZ_GAZEBO_VISIBLE macros
+1.  Add missing GZ_SIM_VISIBLE macros
     * [Pull request #563](https://github.com/gazebosim/gz-sim/pull/563)
 
 1. Fix visibility macro names when used by a different component (Windows)

docker/README.md

@@ -31,7 +31,7 @@ use the Gazebo code found in the current source tree.
     cd ..
     ```
 
-1. Build the gz-gazebo:base image.
+1. Build the gz-sim:base image.
 
     ```
     docker build . -f ./docker/Dockerfile.base -t gz-sim:base
@@ -52,7 +52,7 @@ use the Gazebo code found in the current source tree.
 4. Alternatively, you can directly run Gazebo using
 
     ```
-    ./docker/run.bash gz-sim:nightly ign-gazebo-server -v 4
+    ./docker/run.bash gz-sim:nightly gz-sim-server -v 4
     ```
 
 ## Gazebo Using Debians In Docker

examples/plugin/command_actor/CMakeLists.txt

@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 project(CommandActor)
 
-find_package(ignition-plugin2 REQUIRED COMPONENTS register)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+find_package(gz-plugin2 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(ignition-gazebo7 REQUIRED)
+find_package(gz-sim7 REQUIRED)
 add_library(CommandActor SHARED CommandActor.cc)
 set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
 target_link_libraries(CommandActor
-  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo7::ignition-gazebo7)
+  PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
+  PRIVATE gz-sim7::gz-sim7)

examples/plugin/command_actor/command_actor.sdf

@@ -2,11 +2,11 @@
 <sdf version="1.6">
   <world name="actors">
     <plugin
-      filename="ignition-gazebo-physics-system"
+      filename="gz-sim-physics-system"
       name="gz::sim::systems::Physics">
     </plugin>
     <plugin
-      filename="ignition-gazebo-scene-broadcaster-system"
+      filename="gz-sim-scene-broadcaster-system"
       name="gz::sim::systems::SceneBroadcaster">
     </plugin>
 

examples/plugin/custom_component/CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 project(CustomComponentPlugin)
 
-find_package(ignition-plugin2 REQUIRED COMPONENTS register)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+find_package(gz-plugin2 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(ignition-gazebo7 REQUIRED)
+find_package(gz-sim7 REQUIRED)
 add_library(CustomComponentPlugin SHARED
   CustomComponentPlugin.cc
 )
 set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
 target_link_libraries(CustomComponentPlugin
-  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo7::ignition-gazebo7)
+  PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
+  PRIVATE gz-sim7::gz-sim7)

examples/plugin/custom_sensor_system/CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 project(OdometerSystem)
 
-gz_find_package(ignition-plugin2 REQUIRED COMPONENTS register)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-gz_find_package(ignition-gazebo7 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR})
+gz_find_package(gz-sim7 REQUIRED)
+set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
 
-find_package(ignition-sensors7 REQUIRED)
-set(IGN_SENSORS_VER ${ignition-sensors7_VERSION_MAJOR})
+find_package(gz-sensors7 REQUIRED)
+set(GZ_SENSORS_VER ${gz-sensors7_VERSION_MAJOR})
 
 # Fetch the custom sensor example from ign-sensors
 # Users won't commonly use this to fetch their sensors. The sensor may be part
@@ -27,9 +27,9 @@ add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_cl
 
 add_library(${PROJECT_NAME} SHARED ${PROJECT_NAME}.cc)
 target_link_libraries(${PROJECT_NAME}
-  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo${IGN_GAZEBO_VER}::ignition-gazebo${IGN_GAZEBO_VER}
-  PRIVATE ignition-sensors${IGN_SENSORS_VER}::ignition-sensors${IGN_SENSORS_VER}
+  PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
+  PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
+  PRIVATE gz-sensors${GZ_SENSORS_VER}::gz-sensors${GZ_SENSORS_VER}
   PRIVATE odometer
 )
 target_include_directories(${PROJECT_NAME}

examples/plugin/custom_sensor_system/odometer.sdf

@@ -2,15 +2,15 @@
 <sdf version="1.6">
   <world name="odometer_world">
     <plugin
-      filename="ignition-gazebo-physics-system"
+      filename="gz-sim-physics-system"
       name="gz::sim::systems::Physics">
     </plugin>
     <plugin
-      filename="ignition-gazebo-user-commands-system"
+      filename="gz-sim-user-commands-system"
       name="gz::sim::systems::UserCommands">
     </plugin>
     <plugin
-      filename="ignition-gazebo-scene-broadcaster-system"
+      filename="gz-sim-scene-broadcaster-system"
       name="gz::sim::systems::SceneBroadcaster">
     </plugin>
     <!-- The system is added to the world, so it handles all odometers in the world-->
@@ -101,7 +101,7 @@
 
       <!-- Use the velocity control plugin to give it some initial velocity -->
       <plugin
-        filename="ignition-gazebo-velocity-control-system"
+        filename="gz-sim-velocity-control-system"
         name="gz::sim::systems::VelocityControl">
         <initial_linear>0.2 0 0</initial_linear>
       </plugin>

examples/plugin/gui_system_plugin/CMakeLists.txt

@@ -8,7 +8,7 @@ project(GuiSystemPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(ignition-gazebo7 REQUIRED COMPONENTS gui)
+find_package(gz-sim7 REQUIRED COMPONENTS gui)
 
 QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc)
 
@@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED
   ${resources_RCC}
 )
 target_link_libraries(${PROJECT_NAME}
-  PRIVATE ignition-gazebo7::gui
+  PRIVATE gz-sim7::gui
 )

examples/plugin/gui_system_plugin/README.md

@@ -29,7 +29,7 @@ Add the library to the path:
 
 ~~~
 cd examples/plugin/gui_system_plugin
-export IGN_GUI_PLUGIN_PATH=`pwd`/build
+export GZ_GUI_PLUGIN_PATH=`pwd`/build
 ~~~
 
 Then run a world, for example:

examples/plugin/hello_world/CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 project(Hello_world)
 
-gz_find_package(ignition-plugin2 REQUIRED COMPONENTS register)
-set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-gz_find_package(ignition-gazebo7 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR})
+gz_find_package(gz-sim7 REQUIRED)
+set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
 
 add_library(HelloWorld SHARED HelloWorld)
 set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)
 target_link_libraries(HelloWorld
-  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
-  PRIVATE ignition-gazebo${IGN_GAZEBO_VER}::ignition-gazebo${IGN_GAZEBO_VER})
+  PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
+  PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})