Skip to content

Commit 67f362d

Browse files
authored
Remove major version from package name (#513)
This removes the major version from the package name in the following places: * cmake project name and corresponding find_package calls in examples * package.xml name Signed-off-by: Steve Peters <[email protected]>
1 parent 28982a1 commit 67f362d

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
33
#============================================================================
44
# Initialize the project
55
#============================================================================
6-
project(gz-sensors10 VERSION 10.0.0)
6+
project(gz-sensors VERSION 10.0.0)
77

88
#============================================================================
99
# Find gz-cmake

examples/custom_sensor/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
33
project(odometer)
44

55
find_package(gz-cmake4 REQUIRED)
6-
find_package(gz-sensors10 REQUIRED)
6+
find_package(gz-sensors REQUIRED)
77

88
add_library(${PROJECT_NAME} SHARED Odometer.cc)
99
target_link_libraries(${PROJECT_NAME}
10-
PUBLIC gz-sensors10::gz-sensors10)
10+
PUBLIC gz-sensors::gz-sensors)

examples/imu_noise/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22
project(gz-sensors-noise-demo)
33

44
# Find the Gazebo Libraries used directly by the example
5-
find_package(gz-sensors10 REQUIRED)
5+
find_package(gz-sensors REQUIRED)
66

77
add_executable(sensor_noise main.cc)
8-
target_link_libraries(sensor_noise PUBLIC gz-sensors10)
8+
target_link_libraries(sensor_noise PUBLIC gz-sensors)
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22
project(loop_sensor)
33

4-
find_package(gz-sensors10 REQUIRED
4+
find_package(gz-sensors REQUIRED
55
# Find built-in sensors
66
COMPONENTS
77
altimeter
@@ -12,10 +12,10 @@ add_subdirectory(../custom_sensor odometer)
1212

1313
add_executable(${PROJECT_NAME} main.cc)
1414
target_link_libraries(${PROJECT_NAME} PUBLIC
15-
gz-sensors10::gz-sensors10
15+
gz-sensors::gz-sensors
1616

1717
# Link to custom sensors
1818
odometer
1919

2020
# Link to built-in sensors
21-
gz-sensors10::altimeter)
21+
gz-sensors::altimeter)

examples/save_image/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project(gz-sensors-camera-demo)
33

44
# Find the Gazebo Libraries used directly by the example
55
find_package(gz-rendering9 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
6-
find_package(gz-sensors10 REQUIRED COMPONENTS rendering camera)
6+
find_package(gz-sensors REQUIRED COMPONENTS rendering camera)
77

88
if (TARGET gz-rendering9::ogre)
99
add_definitions(-DWITH_OGRE)
@@ -14,4 +14,4 @@ endif()
1414

1515
add_executable(save_image main.cc)
1616
target_link_libraries(save_image PUBLIC
17-
gz-sensors10::camera)
17+
gz-sensors::camera)

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="2">
4-
<name>gz-sensors10</name>
4+
<name>gz-sensors</name>
55
<version>10.0.0</version>
66
<description>Gazebo Sensors : Sensor models for simulation</description>
77
<maintainer email="[email protected]">Ian Chen</maintainer>

0 commit comments

Comments
 (0)