From 52ecf230b6bb66d9958e2193f259060032a0919c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 17 Nov 2021 22:51:01 -0800 Subject: [PATCH] Use ignition-utils1 Part of #491. Signed-off-by: Steve Peters --- .github/ci/packages.apt | 1 + CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 1 + 3 files changed, 7 insertions(+) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 936a3194c..80fa960e1 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -6,6 +6,7 @@ libignition-common4-dev libignition-math6-dev libignition-math6-eigen3-dev libignition-plugin-dev +libignition-utils1-dev libogre-1.9-dev libogre-2.2-dev libxi-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 2956fe8fe..9ed2fb4a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,11 @@ set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) ign_find_package(ignition-plugin1 REQUIRED COMPONENTS all) set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) +#-------------------------------------- +# Find ignition-utils +ign_find_package(ignition-utils1 REQUIRED) +set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR}) + #-------------------------------------- # Find FreeImage ign_find_package(FreeImage VERSION 3.9 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcfd6f2fc..8fc6d41a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,6 +36,7 @@ set_property( target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PUBLIC ignition-common${IGN_COMMON_VER}::requested + ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} PRIVATE ignition-plugin${IGN_PLUGIN_VER}::loader )