Skip to content

Bump in edifice: ign-rendering5 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chapulina merged 1 commit into from
Nov 3, 2020
Merged

Bump in edifice: ign-rendering5 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ libignition-common3-dev
libignition-math6-dev
libignition-msgs6-dev
libignition-plugin-dev
libignition-rendering4-dev
libignition-rendering5-dev
libignition-tools-dev
libignition-transport9-dev
libsdformat10-dev
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

#--------------------------------------
# Find ignition-rendering
ign_find_package(ignition-rendering4 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
set(IGN_RENDERING_VER ${ignition-rendering4_VERSION_MAJOR})
ign_find_package(ignition-rendering5 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR})

if (TARGET ignition-rendering${IGN_RENDERING_VER}::ogre)
set(HAVE_OGRE TRUE)
Expand Down
6 changes: 3 additions & 3 deletions examples/save_image/CMakeLists.txt
View file
Open in desktop
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-rendering4 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
find_package(ignition-rendering5 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
find_package(ignition-sensors5 REQUIRED COMPONENTS rendering camera)

if (TARGET ignition-rendering4::ogre)
if (TARGET ignition-rendering5::ogre)
add_definitions(-DWITH_OGRE)
endif()
if (TARGET ignition-rendering4::ogre2)
if (TARGET ignition-rendering5::ogre2)
add_definitions(-DWITH_OGRE2)
endif()

Expand Down