From 42e4dc45c2bd89ace95906dd11bae6fa92d22869 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 12 Jan 2021 12:16:09 -0800 Subject: [PATCH] Bump in edifice: ign-msgs7 (#546) Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 6 +++--- CMakeLists.txt | 14 +++++++------- README.md | 6 +++--- docker/Dockerfile.nightly | 6 +++--- examples/standalone/joy_to_twist/CMakeLists.txt | 4 ++-- examples/standalone/joystick/CMakeLists.txt | 4 ++-- examples/standalone/keyboard/CMakeLists.txt | 8 ++++---- examples/standalone/marker/CMakeLists.txt | 8 ++++---- examples/standalone/scene_requester/CMakeLists.txt | 4 ++-- tutorials/migrating_ardupilot_plugin.md | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 6ef6992def..74070d2196 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -4,15 +4,15 @@ libglew-dev libignition-cmake2-dev libignition-common3-dev libignition-gui5-dev -libignition-fuel-tools5-dev +libignition-fuel-tools6-dev libignition-math6-eigen3-dev -libignition-msgs6-dev +libignition-msgs7-dev libignition-physics3-dev libignition-plugin-dev libignition-rendering5-dev libignition-sensors5-dev libignition-tools-dev -libignition-transport9-dev +libignition-transport10-dev libogre-1.9-dev libogre-2.1-dev libprotobuf-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 56e4189ced..960bfcc647 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR}) #-------------------------------------- # Find ignition-transport -ign_find_package(ignition-transport9 REQUIRED COMPONENTS log) -set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) +ign_find_package(ignition-transport10 REQUIRED COMPONENTS log) +set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR}) #-------------------------------------- # Find ignition-msgs -ign_find_package(ignition-msgs6 REQUIRED) -set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) +ign_find_package(ignition-msgs7 REQUIRED) +set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) #-------------------------------------- # Find ignition-common @@ -70,8 +70,8 @@ set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) #-------------------------------------- # Find ignition-fuel_tools -ign_find_package(ignition-fuel_tools5 REQUIRED) -set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools5_VERSION_MAJOR}) +ign_find_package(ignition-fuel_tools6 REQUIRED) +set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools6_VERSION_MAJOR}) #-------------------------------------- # Find ignition-gui @@ -130,7 +130,7 @@ ign_find_package(IgnProtobuf REQUIRED COMPONENTS all PRETTY Protobuf) -set(PROTOBUF_IMPORT_DIRS ${ignition-msgs6_INCLUDE_DIRS}) +set(PROTOBUF_IMPORT_DIRS ${ignition-msgs7_INCLUDE_DIRS}) # Plugin install dirs set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR diff --git a/README.md b/README.md index 4d34826ef2..c1c88d49d0 100644 --- a/README.md +++ b/README.md @@ -235,9 +235,9 @@ line is using symbolic links to each library's YAML file. ``` mkdir ~/.ignition/tools/configs -p cd ~/.ignition/tools/configs/ -ln -s /usr/local/share/ignition/fuel4.yaml . -ln -s /usr/local/share/ignition/transport9.yaml . -ln -s /usr/local/share/ignition/transportlog9.yaml . +ln -s /usr/local/share/ignition/fuel6.yaml . +ln -s /usr/local/share/ignition/transport10.yaml . +ln -s /usr/local/share/ignition/transportlog10.yaml . ... export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs ``` diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 10bab8a405..e13e47a2a6 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -13,15 +13,15 @@ RUN apt-get update \ && apt-get install -y \ libignition-cmake2-dev \ libignition-common3-dev \ - libignition-fuel-tools5-dev \ + libignition-fuel-tools6-dev \ libignition-math6-eigen3-dev \ libignition-plugin-dev \ libignition-physics3-dev \ libignition-rendering5-dev \ libignition-tools-dev \ - libignition-transport9-dev \ + libignition-transport10-dev \ libignition-gui5-dev \ - libignition-msgs6-dev \ + libignition-msgs7-dev \ libignition-sensors5-dev \ libsdformat10-dev diff --git a/examples/standalone/joy_to_twist/CMakeLists.txt b/examples/standalone/joy_to_twist/CMakeLists.txt index a370bc286d..ff4c277f28 100644 --- a/examples/standalone/joy_to_twist/CMakeLists.txt +++ b/examples/standalone/joy_to_twist/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) +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}) diff --git a/examples/standalone/joystick/CMakeLists.txt b/examples/standalone/joystick/CMakeLists.txt index a65f071cec..3d0957d133 100644 --- a/examples/standalone/joystick/CMakeLists.txt +++ b/examples/standalone/joystick/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) # joystick currently works only on linux if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) + 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}) diff --git a/examples/standalone/keyboard/CMakeLists.txt b/examples/standalone/keyboard/CMakeLists.txt index 34e5f6fc22..bdab11aab0 100644 --- a/examples/standalone/keyboard/CMakeLists.txt +++ b/examples/standalone/keyboard/CMakeLists.txt @@ -1,14 +1,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) + 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(ignition-msgs6 REQUIRED) - set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) + find_package(ignition-msgs7 REQUIRED) + set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) find_package(ignition-common3 REQUIRED) set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index 931d976ac9..171aa844d6 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -1,14 +1,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) + find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log) + set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR}) find_package(ignition-common3 REQUIRED) set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR}) - find_package(ignition-msgs6 REQUIRED) - set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) + find_package(ignition-msgs7 REQUIRED) + set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR}) add_executable(marker marker.cc) target_link_libraries(marker diff --git a/examples/standalone/scene_requester/CMakeLists.txt b/examples/standalone/scene_requester/CMakeLists.txt index bdd24b6898..4264cf811b 100644 --- a/examples/standalone/scene_requester/CMakeLists.txt +++ b/examples/standalone/scene_requester/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) -find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) +find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR}) add_executable(scene_requester scene_requester.cc) target_link_libraries(scene_requester diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index f2c5b838da..06a561dd6b 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -807,10 +807,10 @@ find_package(sdformat9 REQUIRED) find_package(ignition-common3-all REQUIRED) find_package(ignition-gazebo5-all REQUIRED) find_package(ignition-math6-all REQUIRED) -find_package(ignition-msgs6-all REQUIRED) +find_package(ignition-msgs7-all REQUIRED) find_package(ignition-physics3-all REQUIRED) find_package(ignition-sensors5-all REQUIRED) -find_package(ignition-transport9-all REQUIRED) +find_package(ignition-transport10-all REQUIRED) ``` In the old code we need only refer to the build configuration retrieved from the Gazebo package: