Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps in ionic : ci_matching_branch/bump_ionic_gz-gui9 #588

Merged
merged 4 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
libgz-cmake3-dev
libgz-common5-dev
libgz-math7-dev
libgz-msgs10-dev
libgz-plugin2-dev
libgz-rendering8-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-math8-dev
libgz-msgs11-dev
libgz-plugin3-dev
libgz-rendering9-dev
libgz-tools2-dev
libgz-transport13-dev
libgz-utils2-dev
libgz-transport14-dev
libgz-utils3-dev
libprotobuf-dev
libprotoc-dev
libtinyxml2-dev
Expand Down
30 changes: 15 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(gz-gui9 VERSION 9.0.0)
#============================================================================
# Find gz-cmake
#============================================================================
find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

#============================================================================
# Configure the project
Expand Down Expand Up @@ -40,38 +40,38 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)

#--------------------------------------
# Find gz-utils
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
gz_find_package(gz-utils3 REQUIRED)
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})

#--------------------------------------
# Find gz-math
gz_find_package(gz-math7 REQUIRED)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
gz_find_package(gz-math8 REQUIRED)
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})

#--------------------------------------
# Find gz-common
gz_find_package(gz-common5 REQUIRED COMPONENTS profiler)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
gz_find_package(gz-common6 REQUIRED COMPONENTS profiler)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})

#--------------------------------------
# Find gz-plugin
gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register)
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})

#--------------------------------------
# Find gz-transport
gz_find_package(gz-transport13 REQUIRED)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
gz_find_package(gz-transport14 REQUIRED)
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})

#--------------------------------------
# Find gz-rendering
gz_find_package(gz-rendering8 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
gz_find_package(gz-rendering9 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})

#--------------------------------------
# Find gz-msgs
gz_find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
gz_find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_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
Expand Down
12 changes: 6 additions & 6 deletions examples/standalone/marker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})

find_package(gz-common5 REQUIRED)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
find_package(gz-common6 REQUIRED)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})

find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})

add_executable(marker marker.cc)
target_link_libraries(marker
Expand Down
12 changes: 6 additions & 6 deletions examples/standalone/point_cloud/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})

find_package(gz-common5 REQUIRED)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
find_package(gz-common6 REQUIRED)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})

find_package(gz-msgs10 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})

add_executable(point_cloud point_cloud.cc)
target_link_libraries(point_cloud
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/scene_provider/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

project(gz-gui-scene-provider)

find_package(gz-msgs10 REQUIRED)
find_package(gz-transport13 REQUIRED)
find_package(gz-msgs11 REQUIRED)
find_package(gz-transport14 REQUIRED)

add_executable(scene_provider
scene_provider.cc
)
target_link_libraries(scene_provider
gz-msgs10::core
gz-transport13::core
gz-msgs11::core
gz-transport14::core
)
2 changes: 1 addition & 1 deletion src/plugins/world_control/WorldControl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ namespace plugins

/// \brief Whether server communication should occur through an event (true)
/// or service (false). The service option was used by default for
/// gz-gui7 and earlier, and now uses the event by default in gz-gui8.
/// gz-gui7 and earlier, and now uses the event by default in gz-gui9.
public: bool useEvent{true};
};
}
Expand Down