Skip to content

Bump gz-cmake and others in jetty #298

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 22, 2025
Merged

Bump gz-cmake and others in jetty #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
binutils-dev
libgflags-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-cmake5-dev
libgz-common7-dev
libgz-sim10-dev
libgz-gui10-dev
libgz-math8-dev
libgz-math8-eigen3-dev
libgz-msgs11-dev
libgz-plugin3-dev
libgz-math9-dev
libgz-math9-eigen3-dev
libgz-msgs12-dev
libgz-plugin4-dev
libgz-tools2-dev
libgz-transport15-dev
libtinyxml2-dev
Expand Down
18 changes: 6 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ project(gz-launch VERSION 9.0.0)
#============================================================================
# Find gz-cmake
#============================================================================
find_package(gz-cmake4 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
find_package(gz-cmake REQUIRED)

#============================================================================
# Configure the project
Expand All @@ -36,18 +35,15 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)

#--------------------------------------
# Find gz-common
gz_find_package(gz-common6 REQUIRED PRIVATE)
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
gz_find_package(gz-common REQUIRED PRIVATE)

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

#--------------------------------------
# Find gz-plugin
gz_find_package(gz-plugin3 REQUIRED_BY launch COMPONENTS loader register)
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
gz_find_package(gz-plugin REQUIRED_BY launch COMPONENTS loader register)

#--------------------------------------
# Find if gz command is available
Expand All @@ -65,13 +61,11 @@ gz_find_package(gz-transport REQUIRED)

#--------------------------------------
# Find gz-msgs
gz_find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
gz_find_package(gz-msgs REQUIRED)

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

#--------------------------------------
# Find gz-gui
Expand Down
10 changes: 5 additions & 5 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<buildtool_depend>cmake</buildtool_depend>

<depend>binutils</depend>
<depend>gz-cmake4</depend>
<depend>gz-common6</depend>
<depend>gz-cmake</depend>
<depend>gz-common</depend>
<depend>gz-gui</depend>
<depend>gz-math8</depend>
<depend>gz-msgs11</depend>
<depend>gz-plugin3</depend>
<depend>gz-math</depend>
<depend>gz-msgs</depend>
<depend>gz-plugin</depend>
<depend>gz-sim</depend>
<depend>gz-tools2</depend>
<depend>gz-transport</depend>
Expand Down
6 changes: 3 additions & 3 deletions plugins/joy_to_twist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ add_library(${plugin} SHARED ${sources})
target_link_libraries(${plugin}
PRIVATE
${PROJECT_LIBRARY_TARGET_NAME}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
gz-plugin${GZ_PLUGIN_VER}::core
gz-common::gz-common
gz-math::gz-math
gz-plugin::core
gz-transport::core
)

Expand Down
6 changes: 3 additions & 3 deletions plugins/joystick/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ add_library(${plugin} SHARED ${sources})
target_link_libraries(${plugin}
PRIVATE
${PROJECT_LIBRARY_TARGET_NAME}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
gz-common::gz-common
gz-math::gz-math
gz-transport::core
gz-plugin${GZ_PLUGIN_VER}::core
gz-plugin::core
)

install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
4 changes: 2 additions & 2 deletions plugins/sim_factory/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ target_link_libraries(${plugin_lower}
PRIVATE
${PROJECT_LIBRARY_TARGET_NAME}
gz-sim::gz-sim
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common::gz-common
gz-transport::core
gz-plugin${GZ_PLUGIN_VER}::core
gz-plugin::core
)

install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
4 changes: 2 additions & 2 deletions plugins/sim_gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ target_link_libraries(${plugin_lower}
gz-sim::gui
gz-sim::gz-sim
gz-gui::gz-gui
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common::gz-common
gz-transport::core
gz-plugin${GZ_PLUGIN_VER}::core
gz-plugin::core
)

install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
4 changes: 2 additions & 2 deletions plugins/sim_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ target_link_libraries(${plugin_lower}
PRIVATE
${PROJECT_LIBRARY_TARGET_NAME}
gz-sim::gz-sim
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common::gz-common
gz-transport::core
gz-plugin${GZ_PLUGIN_VER}::core
gz-plugin::core
)

install (TARGETS ${plugin} DESTINATION ${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH})
8 changes: 4 additions & 4 deletions plugins/websocket_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ if (websockets_FOUND)
PRIVATE
${websockets_LIBRARIES}
${PROJECT_LIBRARY_TARGET_NAME}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common${GZ_COMMON_VER}::graphics
gz-msgs${GZ_MSGS_VER}::core
gz-plugin${GZ_PLUGIN_VER}::core
gz-common::gz-common
gz-common::graphics
gz-msgs::core
gz-plugin::core
gz-transport::core
)

Expand Down
10 changes: 5 additions & 5 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ set_property(
# Link the libraries that we always need.
target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PUBLIC
gz-plugin${GZ_PLUGIN_VER}::loader
gz-plugin${GZ_PLUGIN_VER}::register
gz-plugin::loader
gz-plugin::register
TINYXML2::TINYXML2
PRIVATE
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
gz-common::gz-common
gz-math::gz-math
${BACKWARD_LIBRARIES}
)

Expand All @@ -41,7 +41,7 @@ gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}
EXCLUDE_PROJECT_LIB
LIB_DEPS
${PROJECT_LIBRARY_TARGET_NAME}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common::gz-common
ENVIRONMENT
GZ_LAUNCH_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
)
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ add_library(gz STATIC gz.cc)
target_include_directories(gz PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(gz PUBLIC
${PROJECT_LIBRARY_TARGET_NAME}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-common::gz-common
)

# Define the desired output name of the executable
Expand All @@ -23,8 +23,8 @@ set_target_properties(${launch_executable}
PROPERTIES OUTPUT_NAME ${launch_executable_output_name})
target_link_libraries(${launch_executable}
gz
gz-utils${GZ_UTILS_VER}::cli
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
gz-utils::cli
gz-common::gz-common
)

install(
Expand Down
2 changes: 1 addition & 1 deletion test/integration/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ add_library(bad_plugins SHARED bad_plugins.cc)
target_link_libraries(
bad_plugins
PRIVATE
gz-plugin${GZ_PLUGIN_VER}::core
gz-plugin::core
${PROJECT_LIBRARY_TARGET_NAME}
)
2 changes: 1 addition & 1 deletion tutorials/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ necessary prerequisites followed by building from source.
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install libgz-cmake4-dev libgz-sim10-dev
sudo apt-get -y install libgz-cmake5-dev libgz-sim10-dev
```

### Building from source
Expand Down
Loading