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

Bump edifice sdformat11 and ign-physics4 #549

Merged
merged 3 commits into from
Jan 19, 2021
Merged

Bump edifice sdformat11 and ign-physics4 #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a11e143
Bump in edifice: sdformat11
chapulina Jan 12, 2021
5955a7d
Remove physics3
chapulina Jan 14, 2021
79723f3
Merge branch 'main' into bump_edifice_sdformat
chapulina Jan 16, 2021
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
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ libignition-gui5-dev
libignition-fuel-tools6-dev
libignition-math6-eigen3-dev
libignition-msgs7-dev
libignition-physics3-dev
libignition-physics4-dev
libignition-plugin-dev
libignition-rendering5-dev
libignition-sensors5-dev
Expand All @@ -17,7 +17,7 @@ libogre-1.9-dev
libogre-2.1-dev
libprotobuf-dev
libprotoc-dev
libsdformat10-dev
libsdformat11-dev
libtinyxml2-dev
libxi-dev
libxmu-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 @@ -38,8 +38,8 @@ endif()
# Search for project-specific dependencies
#============================================================================

ign_find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})
ign_find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
Expand Down Expand Up @@ -87,13 +87,13 @@ ign_find_package (Qt5

#--------------------------------------
# Find ignition-physics
ign_find_package(ignition-physics3 VERSION 3.1
ign_find_package(ignition-physics4
COMPONENTS
mesh
sdf
REQUIRED
)
set(IGN_PHYSICS_VER ${ignition-physics3_VERSION_MAJOR})
set(IGN_PHYSICS_VER ${ignition-physics4_VERSION_MAJOR})

#--------------------------------------
# Find ignition-sensors
Expand Down
4 changes: 2 additions & 2 deletions bitbucket-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipelines:
libignition-transport8-dev
libsdformat9-dev
libignition-fuel-tools4-dev
libignition-physics3-dev
libignition-physics4-dev
# libignition-common3-dev
# libignition-gui3-dev
# libignition-sensors3-dev
Expand Down Expand Up @@ -78,7 +78,7 @@ pipelines:
libignition-tools-dev
# libignition-fuel-tools4-dev
# libignition-physics2-dev
# libsdformat9-dev
# libsdformat11-dev
# libignition-gui3-dev
# libignition-msgs5-dev
# libignition-rendering3-dev
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ RUN apt-get update \
libignition-fuel-tools6-dev \
libignition-math6-eigen3-dev \
libignition-plugin-dev \
libignition-physics3-dev \
libignition-physics4-dev \
libignition-rendering5-dev \
libignition-tools-dev \
libignition-transport10-dev \
libignition-gui5-dev \
libignition-msgs7-dev \
libignition-sensors5-dev \
libsdformat10-dev
libsdformat11-dev

COPY . ign-gazebo
RUN cd ign-gazebo \
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/joy_to_twist/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})
find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})

add_executable(joy_to_twist joy_to_twist.cc)
target_link_libraries(joy_to_twist
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/joystick/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})
find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})

add_executable(joystick joystick.cc)
target_link_libraries(joystick
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/keyboard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})
find_package(sdformat11 REQUIRED)
set(SDF_VER ${sdformat11_VERSION_MAJOR})

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion tutorials/migrating_ardupilot_plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ find_package(ignition-common3-all REQUIRED)
find_package(ignition-gazebo5-all REQUIRED)
find_package(ignition-math6-all REQUIRED)
find_package(ignition-msgs7-all REQUIRED)
find_package(ignition-physics3-all REQUIRED)
find_package(ignition-physics4-all REQUIRED)
find_package(ignition-sensors5-all REQUIRED)
find_package(ignition-transport10-all REQUIRED)
```
Expand Down