From 5371f05881fd16c4f5a6de3ab9f85eeb81938323 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Sat, 11 Feb 2023 00:48:30 +0000 Subject: [PATCH] bum transport and msgs version Signed-off-by: Ian Chen --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 8 ++++---- examples/standalone/marker/CMakeLists.txt | 8 ++++---- examples/standalone/point_cloud/CMakeLists.txt | 8 ++++---- examples/standalone/scene_provider/CMakeLists.txt | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 9f84cee77..627cfc26e 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,11 +1,11 @@ libgz-cmake3-dev libgz-common5-dev libgz-math7-dev -libgz-msgs9-dev +libgz-msgs10-dev libgz-plugin2-dev libgz-rendering8-dev libgz-tools2-dev -libgz-transport12-dev +libgz-transport13-dev libgz-utils2-dev libprotobuf-dev libprotoc-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d1584883..9b17a1996 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,8 @@ set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR}) #-------------------------------------- # Find gz-transport -gz_find_package(gz-transport12 REQUIRED) -set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR}) +gz_find_package(gz-transport13 REQUIRED) +set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) #-------------------------------------- # Find gz-rendering @@ -72,8 +72,8 @@ set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR}) #-------------------------------------- # Find gz-msgs -gz_find_package(gz-msgs9 REQUIRED) -set(GZ_MSGS_VER ${gz-msgs9_VERSION_MAJOR}) +gz_find_package(gz-msgs10 REQUIRED) +set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) # Find if command is available. This is used to enable tests. # Note that CLI files are installed regardless of whether the dependency is diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index b8a7f860f..571fc03b1 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-gui-marker) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(gz-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR}) + find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) + set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) find_package(gz-common5 REQUIRED) set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) - find_package(gz-msgs9 REQUIRED) - set(GZ_MSGS_VER ${gz-msgs9_VERSION_MAJOR}) + find_package(gz-msgs10 REQUIRED) + set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) add_executable(marker marker.cc) target_link_libraries(marker diff --git a/examples/standalone/point_cloud/CMakeLists.txt b/examples/standalone/point_cloud/CMakeLists.txt index a5dd9e439..617e7e816 100644 --- a/examples/standalone/point_cloud/CMakeLists.txt +++ b/examples/standalone/point_cloud/CMakeLists.txt @@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-gui-point-cloud-example) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(gz-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR}) + find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) + set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) find_package(gz-common5 REQUIRED) set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) - find_package(gz-msgs9 REQUIRED) - set(GZ_MSGS_VER ${gz-msgs9_VERSION_MAJOR}) + find_package(gz-msgs10 REQUIRED) + set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) add_executable(point_cloud point_cloud.cc) target_link_libraries(point_cloud diff --git a/examples/standalone/scene_provider/CMakeLists.txt b/examples/standalone/scene_provider/CMakeLists.txt index fcaad2a92..bf5abb269 100644 --- a/examples/standalone/scene_provider/CMakeLists.txt +++ b/examples/standalone/scene_provider/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-gui-scene-provider) -find_package(gz-msgs9 REQUIRED) -find_package(gz-transport12 REQUIRED) +find_package(gz-msgs10 REQUIRED) +find_package(gz-transport13 REQUIRED) add_executable(scene_provider scene_provider.cc ) target_link_libraries(scene_provider - gz-msgs9::core - gz-transport12::core + gz-msgs10::core + gz-transport13::core )