Skip to content

Commit 7ea2119

Browse files
authored
Bump gz-transport and others in jetty (#515)
* Bumping gz-transport;gz-sensors to 15;10 * Manually remove GZ_TRANSPORT_VER Signed-off-by: Steve Peters <[email protected]>
1 parent 100d5c9 commit 7ea2119

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

.github/ci/packages.apt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ libgz-math8-dev
44
libgz-msgs11-dev
55
libgz-rendering9-dev
66
libgz-tools2-dev
7-
libgz-transport14-dev
7+
libgz-transport15-dev
88
libsdformat15-dev
99
xvfb

.github/disabled_workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77

88
env:
9-
PACKAGE: gz-sensors9
9+
PACKAGE: gz-sensors10
1010
runs-on: macos-latest
1111
steps:
1212
- uses: actions/checkout@v3

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
5656

5757
#--------------------------------------
5858
# Find gz-transport
59-
gz_find_package(gz-transport14 REQUIRED)
60-
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
59+
gz_find_package(gz-transport REQUIRED)
6160

6261
#--------------------------------------
6362
# Find gz-rendering

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<depend>gz-msgs11</depend>
1818
<depend>gz-rendering9</depend>
1919
<depend>gz-tools2</depend>
20-
<depend>gz-transport14</depend>
20+
<depend>gz-transport</depend>
2121
<depend>sdformat15</depend>
2222

2323
<test_depend>xvfb</test_depend>

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
4444
PUBLIC
4545
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
4646
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
47-
gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
47+
gz-transport::gz-transport
4848
sdformat${SDF_VER}::sdformat${SDF_VER}
4949
PRIVATE
5050
gz-common${GZ_COMMON_VER}::profiler

tutorials/thermal_camera.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ project(image-listener)
356356
357357
# Find the Gazebo Libraries used directly by the example
358358
find_package(gz-msgs11 REQUIRED)
359-
find_package(gz-transport14 REQUIRED)
359+
find_package(gz-transport REQUIRED)
360360
361361
add_executable(${PROJECT_NAME} main.cpp)
362-
target_link_libraries(${PROJECT_NAME} PUBLIC gz-msgs11 gz-transport14)
362+
target_link_libraries(${PROJECT_NAME} PUBLIC gz-msgs11 gz-transport)
363363
target_include_directories(${PROJECT_NAME} PUBLIC ${gz_msgs11_INCLUDE_DIRS})
364364
```
365365

0 commit comments

Comments
 (0)