Remove major version from package name

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-sim10 VERSION 10.0.0)
+project(gz-sim VERSION 10.0.0)
 set (GZ_DISTRIBUTION "Ionic")
 
 #============================================================================

examples/plugin/command_actor/CMakeLists.txt

@@ -7,9 +7,9 @@ project(CommandActor)
 find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
+find_package(gz-sim REQUIRED)
 add_library(CommandActor SHARED CommandActor.cc)
 set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
 target_link_libraries(CommandActor
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim10::gz-sim10)
+  PRIVATE gz-sim::gz-sim)

examples/plugin/custom_component/CMakeLists.txt

@@ -7,11 +7,11 @@ project(CustomComponentPlugin)
 find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
+find_package(gz-sim REQUIRED)
 add_library(CustomComponentPlugin SHARED
   CustomComponentPlugin.cc
 )
 set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
 target_link_libraries(CustomComponentPlugin
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim10::gz-sim10)
+  PRIVATE gz-sim::gz-sim)

examples/plugin/custom_sensor_system/CMakeLists.txt

@@ -7,8 +7,7 @@ project(OdometerSystem)
 gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-gz_find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+gz_find_package(gz-sim REQUIRED)
 
 find_package(gz-sensors9 REQUIRED)
 set(GZ_SENSORS_VER ${gz-sensors9_VERSION_MAJOR})
@@ -29,7 +28,7 @@ add_library(${PROJECT_NAME} SHARED ${PROJECT_NAME}.cc)
 target_link_libraries(${PROJECT_NAME}
   PRIVATE
     gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-    gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
+    gz-sim::gz-sim
     gz-sensors${GZ_SENSORS_VER}::gz-sensors${GZ_SENSORS_VER}
     odometer
 )

examples/plugin/gui_system_plugin/CMakeLists.txt

@@ -8,7 +8,7 @@ project(GuiSystemPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(gz-sim10 REQUIRED COMPONENTS gui)
+find_package(gz-sim 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 gz-sim10::gui
+  PRIVATE gz-sim::gui
 )

examples/plugin/hello_world/CMakeLists.txt

@@ -7,11 +7,10 @@ project(Hello_world)
 gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-gz_find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+gz_find_package(gz-sim REQUIRED)
 
 add_library(HelloWorld SHARED HelloWorld.cc)
 set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)
 target_link_libraries(HelloWorld
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  PRIVATE gz-sim::gz-sim)

examples/plugin/priority_printer_plugin/CMakeLists.txt

@@ -7,11 +7,10 @@ project(Priority_printer)
 gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-gz_find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+gz_find_package(gz-sim REQUIRED)
 
 add_library(PriorityPrinter SHARED PriorityPrinter.cc)
 set_property(TARGET PriorityPrinter PROPERTY CXX_STANDARD 17)
 target_link_libraries(PriorityPrinter
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  PRIVATE gz-sim::gz-sim)

examples/plugin/rendering_plugins/CMakeLists.txt

@@ -32,13 +32,13 @@ target_link_libraries(${GUI_PLUGIN}
 set(SERVER_PLUGIN RenderingServerPlugin)
 
 find_package(gz-plugin3 REQUIRED COMPONENTS register)
-find_package(gz-sim10 REQUIRED)
+find_package(gz-sim REQUIRED)
 
 add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc)
 set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17)
 target_link_libraries(${SERVER_PLUGIN}
   PRIVATE
     gz-plugin3::gz-plugin3
-    gz-sim10::gz-sim10
+    gz-sim::gz-sim
     gz-rendering9::gz-rendering9
 )

examples/plugin/reset_plugin/CMakeLists.txt

@@ -5,10 +5,9 @@ project(ResetPlugins)
 find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 add_library(JointPositionRandomizer SHARED JointPositionRandomizer.cc)
 target_link_libraries(JointPositionRandomizer
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim${GZ_SIM_VER}::core)
+  PRIVATE gz-sim::core)

examples/plugin/system_plugin/CMakeLists.txt

@@ -7,9 +7,9 @@ project(SampleSystem)
 find_package(gz-plugin3 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
+find_package(gz-sim REQUIRED)
 add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)
 set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17)
 target_link_libraries(SampleSystem
   PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
-  PRIVATE gz-sim10::gz-sim10)
+  PRIVATE gz-sim::gz-sim)

examples/scripts/python_api/systems/test_system.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from gz.math8 import Vector3d
-from gz.sim10 import Model, Link
+from gz.sim import Model, Link
 import random
 
 

examples/scripts/python_api/testFixture.py

@@ -25,7 +25,7 @@
 import os
 
 from gz.common6 import set_verbosity
-from gz.sim10 import TestFixture, World, world_entity
+from gz.sim import TestFixture, World, world_entity
 from gz.math8 import Vector3d
 
 set_verbosity(4)

examples/standalone/acoustic_comms_demo/CMakeLists.txt

@@ -5,10 +5,9 @@ project(gz-sim-acoustic-comms-demo)
 find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 add_executable(acoustic_comms_demo acoustic_comms_demo.cc)
 target_link_libraries(acoustic_comms_demo
   gz-transport${GZ_TRANSPORT_VER}::core
-  gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  gz-sim::gz-sim)

examples/standalone/custom_server/CMakeLists.txt

@@ -3,11 +3,10 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-sim-custom-server)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(gz-sim10 REQUIRED)
-  set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+  find_package(gz-sim REQUIRED)
 
   add_executable(custom_server custom_server.cc)
   target_link_libraries(custom_server
-    gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
+    gz-sim::gz-sim
     )
 endif()

examples/standalone/each_performance/CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 project(gz-sim-each-performance)
 
-find_package(gz-sim10 QUIET REQUIRED)
+find_package(gz-sim QUIET REQUIRED)
 
 add_executable(each each.cc)
 target_link_libraries(each
-  gz-sim10::core)
+  gz-sim::core)

examples/standalone/external_ecm/CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 project(gz-sim-external-ecm)
 
-find_package(gz-sim10 REQUIRED)
+find_package(gz-sim REQUIRED)
 
 add_executable(external_ecm external_ecm.cc)
 target_link_libraries(external_ecm
-  gz-sim10::core)
+  gz-sim::core)

examples/standalone/gtest_setup/CMakeLists.txt

@@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(GTestSetup)
 
 # Find Gazebo
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 # Fetch and configure GTest
 include(FetchContent)
@@ -30,7 +29,7 @@ foreach(TEST_TARGET
   )
   target_link_libraries(${TEST_TARGET}
     gtest_main
-    gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER}
+    gz-sim::gz-sim
   )
   include(GoogleTest)
   gtest_discover_tests(${TEST_TARGET})

examples/standalone/light_control/CMakeLists.txt

@@ -5,10 +5,9 @@ project(gz-sim-light-control)
 find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 add_executable(light_control light_control.cc)
 target_link_libraries(light_control
   gz-transport${GZ_TRANSPORT_VER}::core
-  gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  gz-sim::gz-sim)

examples/standalone/lrauv_control/CMakeLists.txt

@@ -5,10 +5,9 @@ project(gz-sim-lrauv-control)
 find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 add_executable(lrauv_control lrauv_control.cc)
 target_link_libraries(lrauv_control
   gz-transport${GZ_TRANSPORT_VER}::core
-  gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  gz-sim::gz-sim)

examples/standalone/multi_lrauv_race/CMakeLists.txt

@@ -5,10 +5,9 @@ project(gz-sim-multi-lrauv-race)
 find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
-find_package(gz-sim10 REQUIRED)
-set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})
+find_package(gz-sim REQUIRED)
 
 add_executable(multi_lrauv_race multi_lrauv_race.cc)
 target_link_libraries(multi_lrauv_race
   gz-transport${GZ_TRANSPORT_VER}::core
-  gz-sim${GZ_SIM_VER}::gz-sim${GZ_SIM_VER})
+  gz-sim::gz-sim)

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-sim10</name>
+  <name>gz-sim</name>
   <version>10.0.0</version>
   <description>Gazebo Sim : A Robotic Simulator</description>
   <maintainer email="[email protected]">Michael Carroll</maintainer>

python/CMakeLists.txt

@@ -25,7 +25,7 @@ function(configure_build_install_location _library_name)
   )
 endfunction()
 
-set(BINDINGS_MODULE_NAME "sim${PROJECT_VERSION_MAJOR}")
+set(BINDINGS_MODULE_NAME "sim")
 pybind11_add_module(${BINDINGS_MODULE_NAME} MODULE
   src/gz/sim/_gz_sim_pybind11.cc
   src/gz/sim/Actor.cc

python/test/actor_TEST.py

@@ -18,8 +18,8 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import (Actor, K_NULL_ENTITY,
-                              TestFixture, World, world_entity)
+from gz.sim import (Actor, K_NULL_ENTITY,
+                    TestFixture, World, world_entity)
 from gz_test_deps.math import Pose3d
 
 

python/test/joint_TEST.py

@@ -17,8 +17,8 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import (K_NULL_ENTITY, TestFixture,
-                              Joint, Model, World, world_entity)
+from gz.sim import (K_NULL_ENTITY, TestFixture,
+                    Joint, Model, World, world_entity)
 from gz_test_deps.math import Pose3d
 from gz_test_deps.sdformat import JointAxis, JointType
 

python/test/light_TEST.py

@@ -17,8 +17,8 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import (K_NULL_ENTITY, Light,
-                              TestFixture, World, world_entity)
+from gz.sim import (K_NULL_ENTITY, Light,
+                    TestFixture, World, world_entity)
 from gz_test_deps.math import Angle, Color, Pose3d, Vector3d
 
 

python/test/link_TEST.py

@@ -17,7 +17,7 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, Link, Model, World, world_entity
+from gz.sim import K_NULL_ENTITY, TestFixture, Link, Model, World, world_entity
 from gz_test_deps.math import Inertiald, Matrix3d, Vector3d, Pose3d
 
 class TestModel(unittest.TestCase):

python/test/model_TEST.py

@@ -17,7 +17,7 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, Model, World, world_entity
+from gz.sim import K_NULL_ENTITY, TestFixture, Model, World, world_entity
 
 class TestModel(unittest.TestCase):
     post_iterations = 0

python/test/plugins/test_model_system.py

@@ -19,7 +19,7 @@
 # Add "../__file__" to sys.path to get gz_test_deps
 sys.path.append(dirname(dirname(realpath(__file__))))
 
-from gz_test_deps.sim import Model
+from gz.sim import Model
 from gz_test_deps.transport import Node
 from gz_test_deps.msgs.pose_pb2 import Pose
 from gz_test_deps.msgs.clock_pb2 import Clock

python/test/sensor_TEST.py

@@ -17,8 +17,8 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import (K_NULL_ENTITY, TestFixture,
-                              Joint, Model, Sensor, World, world_entity)
+from gz.sim import (K_NULL_ENTITY, TestFixture,
+                    Joint, Model, Sensor, World, world_entity)
 from gz_test_deps.math import Pose3d
 
 

python/test/testFixture_TEST.py

@@ -17,7 +17,7 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import TestFixture, World, world_entity
+from gz.sim import TestFixture, World, world_entity
 from gz_test_deps.math import Vector3d
 
 post_iterations = 0

python/test/world_TEST.py

@@ -17,7 +17,7 @@
 import unittest
 
 from gz_test_deps.common import set_verbosity
-from gz_test_deps.sim import K_NULL_ENTITY, TestFixture, World, world_entity
+from gz.sim import K_NULL_ENTITY, TestFixture, World, world_entity
 from gz_test_deps.math import SphericalCoordinates, Vector3d
 from gz_test_deps.sdformat import Atmosphere
 

src/CMakeLists.txt

@@ -182,8 +182,8 @@ target_link_libraries(${gz_lib_target}
   PUBLIC
     ${PROJECT_LIBRARY_TARGET_NAME}
     gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
-    gz-sim${PROJECT_VERSION_MAJOR}
-    gz-sim${PROJECT_VERSION_MAJOR}-gui
+    gz-sim
+    gz-sim-gui
 )
 
 # Executable target that runs the GUI without ruby for debugging purposes.
@@ -253,7 +253,7 @@ gz_build_tests(TYPE UNIT
   LIB_DEPS
     ${PROJECT_LIBRARY_TARGET_NAME}
     ${EXTRA_TEST_LIB_DEPS}
-    gz-sim${PROJECT_VERSION_MAJOR}
+    gz-sim
   ENVIRONMENT
     GZ_SIM_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
 )