From 07537e9b8a2169b4d4de7bf6e2c06d2c05342b08 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 28 Apr 2025 22:01:34 +0000 Subject: [PATCH] Support gz-cmake without major version Signed-off-by: Steve Peters --- CMakeLists.txt | 6 +++--- colcon.pkg | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 979efaa..a85bc5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/colcon.pkg b/colcon.pkg index d80827f..ee95686 100644 --- a/colcon.pkg +++ b/colcon.pkg @@ -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"], }