From e718a36a1a05c06e5b4615cedf73bc2cb56def64 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 16 Apr 2021 10:50:13 -0700 Subject: [PATCH] Bumps in fortress : ign-sensors6 (#120) Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 8 ++++---- CMakeLists.txt | 16 ++++++++-------- examples/save_image/CMakeLists.txt | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 22df5404..e91044eb 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,10 +1,10 @@ libignition-cmake2-dev libignition-common4-dev libignition-math6-dev -libignition-msgs7-dev +libignition-msgs8-dev libignition-plugin-dev -libignition-rendering5-dev +libignition-rendering6-dev libignition-tools-dev -libignition-transport10-dev -libsdformat11-dev +libignition-transport11-dev +libsdformat12-dev xvfb diff --git a/CMakeLists.txt b/CMakeLists.txt index d6e99484..58b243ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,13 +55,13 @@ set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR}) #-------------------------------------- # Find ignition-transport -ign_find_package(ignition-transport10 REQUIRED) -set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR}) +ign_find_package(ignition-transport11 REQUIRED) +set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR}) #-------------------------------------- # Find ignition-rendering -ign_find_package(ignition-rendering5 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) -set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR}) +ign_find_package(ignition-rendering6 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) +set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR}) if (TARGET ignition-rendering${IGN_RENDERING_VER}::ogre) set(HAVE_OGRE TRUE) @@ -75,8 +75,8 @@ endif() #-------------------------------------- # Find ignition-msgs -ign_find_package(ignition-msgs7 REQUIRED) -set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) +ign_find_package(ignition-msgs8 REQUIRED) +set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR}) #-------------------------------------- # Find ignition-plugin @@ -85,8 +85,8 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) #-------------------------------------- # Find SDFormat -ign_find_package(sdformat11 REQUIRED) -set(SDF_VER ${sdformat11_VERSION_MAJOR}) +ign_find_package(sdformat12 REQUIRED) +set(SDF_VER ${sdformat12_VERSION_MAJOR}) set(IGN_SENSORS_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) diff --git a/examples/save_image/CMakeLists.txt b/examples/save_image/CMakeLists.txt index d3e9a61d..e611b3e8 100644 --- a/examples/save_image/CMakeLists.txt +++ b/examples/save_image/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(ignition-sensors-camera-demo) # Find the Ignition Libraries used directly by the example -find_package(ignition-rendering5 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) +find_package(ignition-rendering6 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) find_package(ignition-sensors6 REQUIRED COMPONENTS rendering camera) -if (TARGET ignition-rendering5::ogre) +if (TARGET ignition-rendering6::ogre) add_definitions(-DWITH_OGRE) endif() -if (TARGET ignition-rendering5::ogre2) +if (TARGET ignition-rendering6::ogre2) add_definitions(-DWITH_OGRE2) endif()