From 6893c3d46d61e19ab0a9e5e0b2d8fec6939522ac Mon Sep 17 00:00:00 2001 From: Rhys Mainwaring Date: Mon, 18 Dec 2023 15:09:14 +0000 Subject: [PATCH] Support Gazebo Harmonic Signed-off-by: Rhys Mainwaring --- sdformat_urdf/CMakeLists.txt | 4 ++++ sdformat_urdf/package.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sdformat_urdf/CMakeLists.txt b/sdformat_urdf/CMakeLists.txt index b2eec75..91b0da5 100644 --- a/sdformat_urdf/CMakeLists.txt +++ b/sdformat_urdf/CMakeLists.txt @@ -38,6 +38,10 @@ elseif("$ENV{GZ_VERSION}" STREQUAL "garden") find_package(sdformat13 REQUIRED) set(SDF_VER ${sdformat13_VERSION_MAJOR}) message(STATUS "Compiling against Gazebo Garden (libSDFormat 13)") +elseif("$ENV{GZ_VERSION}" STREQUAL "harmonic") + find_package(sdformat14 REQUIRED) + set(SDF_VER ${sdformat14_VERSION_MAJOR}) + message(STATUS "Compiling against Gazebo Harmonic (libSDFormat 14)") # No GZ distribution specified, find any version of libsdformat we can else() foreach(major RANGE 13 9) diff --git a/sdformat_urdf/package.xml b/sdformat_urdf/package.xml index c8ecf65..e4a6088 100644 --- a/sdformat_urdf/package.xml +++ b/sdformat_urdf/package.xml @@ -25,6 +25,8 @@ sdformat13 + + sdformat14 urdf