Skip to content
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

Jump to bottom

Bump in edifice: ign-rendering5 #69

Merged
merged 1 commit into from
Nov 3, 2020
Merged

Bump in edifice: ign-rendering5 #69

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
8 changes: 4 additions & 4 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ libgflags-dev
libignition-cmake2-dev
libignition-common3-dev
libignition-fuel-tools5-dev
libignition-gazebo4-dev
libignition-gui4-dev
libignition-gazebo5-dev
libignition-gui5-dev
libignition-math6-dev
libignition-math6-eigen3-dev
libignition-msgs6-dev
libignition-physics3-dev
libignition-plugin-dev
libignition-rendering4-dev
libignition-sensors4-dev
libignition-rendering5-dev
libignition-sensors5-dev
libignition-tools-dev
libignition-transport9-dev
libsdformat10-dev
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ set(IGN_MATH_MAJOR_VER ${ignition-math6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
ign_find_package(ignition-gui4 REQUIRED)
set(IGN_GUI_MAJOR_VER ${ignition-gui4_VERSION_MAJOR})
ign_find_package(ignition-gui5 REQUIRED)
set(IGN_GUI_MAJOR_VER ${ignition-gui5_VERSION_MAJOR})
ign_find_package (Qt5
COMPONENTS
Core
Expand All @@ -79,8 +79,8 @@ ign_find_package (Qt5

#--------------------------------------
# Find ignition-gazebo
ign_find_package(ignition-gazebo4 REQUIRED PRIVATE COMPONENTS gui)
set(IGN_GAZEBO_MAJOR_VER ${ignition-gazebo4_VERSION_MAJOR})
ign_find_package(ignition-gazebo5 REQUIRED PRIVATE COMPONENTS gui)
set(IGN_GAZEBO_MAJOR_VER ${ignition-gazebo5_VERSION_MAJOR})

ign_pkg_check_modules(websockets libwebsockets)
if (NOT websockets_FOUND)
Expand Down
8 changes: 4 additions & 4 deletions bitbucket-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ pipelines:
libignition-tools-dev
libignition-transport9-dev
libsdformat10-dev
# libignition-gazebo4-dev
# libignition-gui4-dev
# libignition-rendering4-dev
# libignition-sensors4-dev
# libignition-gazebo5-dev
# libignition-gui5-dev
# libignition-rendering5-dev
# libignition-sensors5-dev
# # Ignition msgs (uncomment if a specific branch is needed)
# - apt install -y
# libprotobuf-dev protobuf-compiler libprotoc-dev
Expand Down