From 6c5e23be376eb66bbed1ce7245a2abbce442702e Mon Sep 17 00:00:00 2001 From: Sumanth Nirmal Date: Thu, 3 Mar 2022 23:26:04 -0800 Subject: [PATCH 1/2] Update build-test pipeline to use the iceoryx 2.0 release branch Signed-off-by: Sumanth Nirmal --- .azure/templates/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/templates/build-test.yml b/.azure/templates/build-test.yml index 9c2452c6..2baa85bb 100644 --- a/.azure/templates/build-test.yml +++ b/.azure/templates/build-test.yml @@ -88,7 +88,7 @@ steps: set -e -x sudo apt-get install libacl1-dev libncurses5-dev pkg-config git clone --depth 1 \ - --branch "${ICEORYX_BRANCH:-v1.0.1}" \ + --branch "${ICEORYX_BRANCH:-release_2.0}" \ "${ICEORYX_REPOSITORY:-https://github.com/eclipse-iceoryx/iceoryx.git}" \ iceoryx mkdir iceoryx/build From 9c8351b5991af6c076ca65e580c4388edad597c4 Mon Sep 17 00:00:00 2001 From: Sumanth Nirmal Date: Thu, 3 Mar 2022 23:26:23 -0800 Subject: [PATCH 2/2] Fix the dependencies for iceoryx2.0 Signed-off-by: Sumanth Nirmal --- src/ddscxx/tests/CMakeLists.txt | 2 +- src/ddscxx/tests/SharedMemory.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ddscxx/tests/CMakeLists.txt b/src/ddscxx/tests/CMakeLists.txt index d7293ae2..9865c072 100644 --- a/src/ddscxx/tests/CMakeLists.txt +++ b/src/ddscxx/tests/CMakeLists.txt @@ -31,7 +31,7 @@ configure_file( if(ENABLE_SHM) # Packages required packages for SHM tests find_package(iceoryx_posh REQUIRED) - find_package(iceoryx_posh_roudi_environment REQUIRED) + find_package(iceoryx_posh_testing REQUIRED) endif() set(sources diff --git a/src/ddscxx/tests/SharedMemory.cpp b/src/ddscxx/tests/SharedMemory.cpp index 14df7291..d1a6f915 100644 --- a/src/ddscxx/tests/SharedMemory.cpp +++ b/src/ddscxx/tests/SharedMemory.cpp @@ -20,7 +20,7 @@ #include "Serialization.hpp" #include "iceoryx_posh/popo/subscriber.hpp" #include "iceoryx_posh/popo/sample.hpp" -#include "iceoryx_utils/cxx/optional.hpp" +#include "iceoryx_hoofs/cxx/optional.hpp" #include