Skip to content

Commit

Permalink
Bumps in fortress : ign-sensors6 (#120)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
chapulina authored Apr 16, 2021
1 parent b749389 commit e718a36
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -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
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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})

Expand Down
6 changes: 3 additions & 3 deletions examples/save_image/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit e718a36

Please sign in to comment.