Skip to content

Commit 81f7dda

Browse files
authored
Support gz-cmake without major version (#161)
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
1 parent f3b3d61 commit 81f7dda

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ find_package(gz-cmake3 QUIET)
1212
if (NOT ${gz-cmake3_FOUND})
1313
find_package(gz-cmake4 QUIET)
1414
if (NOT ${gz-cmake4_FOUND})
15-
find_package(gz-cmake5 QUIET)
16-
if (NOT ${gz-cmake5_FOUND})
17-
message(FATAL_ERROR "Could not find gz-cmake3, gz-cmake4, or gz-cmake5")
15+
find_package(gz-cmake QUIET)
16+
if (NOT ${gz-cmake_FOUND})
17+
message(FATAL_ERROR "Could not find gz-cmake3, gz-cmake4, or gz-cmake")
1818
endif()
1919
endif()
2020
endif()

colcon.pkg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# - https://colcon.readthedocs.io/en/released/user/configuration.html#colcon-pkg-files
55

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

0 commit comments

Comments
 (0)