Skip to content

Support gz-cmake without major version #161

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
scpeters merged 1 commit into from
Apr 28, 2025
Merged

Support gz-cmake without major version #161

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
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ find_package(gz-cmake3 QUIET)
if (NOT ${gz-cmake3_FOUND})
find_package(gz-cmake4 QUIET)
if (NOT ${gz-cmake4_FOUND})
find_package(gz-cmake5 QUIET)
if (NOT ${gz-cmake5_FOUND})
message(FATAL_ERROR "Could not find gz-cmake3, gz-cmake4, or gz-cmake5")
find_package(gz-cmake QUIET)
if (NOT ${gz-cmake_FOUND})
message(FATAL_ERROR "Could not find gz-cmake3, gz-cmake4, or gz-cmake")
endif()
endif()
endif()
Expand Down
4 changes: 2 additions & 2 deletions colcon.pkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - https://colcon.readthedocs.io/en/released/user/configuration.html#colcon-pkg-files

{
# explicitly add gz-cmake4 and gz-cmake5 as dependencies since they are not included in the package.xml
# explicitly add gz-cmake4 and gz-cmake as dependencies since they are not included in the package.xml
# see https://github.com/gazebosim/gz-tools/pull/142 for discussion of alternatives
"dependencies": ["gz-cmake4", "gz-cmake5"],
"dependencies": ["gz-cmake4", "gz-cmake"],
}
Loading