iox-eclipse-iceoryx#2 Add changes relevant for 'iceoryx_dust'

Signed-off-by: Simon Hoinkis <[email protected]>
ApexAI · Aug 8, 2022 · bd59e02 · bd59e02
1 parent 269e9b9
commit bd59e02
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,25 +18,28 @@ cmake_minimum_required(VERSION 3.16)
 
 # check if iceoryx is in CMAKE_PREFIX_PATH
 find_package(iceoryx_hoofs QUIET)
+find_package(iceoryx_dust QUIET)
 find_package(iceoryx_posh QUIET)
 
 # Link iceoryx_hoofs and iceoryx_posh libraries statically
 option(BUILD_SHARED_LIBS "Link libraries dynamically" OFF)
 
 # fetch iceoryx if not found
-if(NOT iceoryx_hoofs_FOUND OR NOT iceoryx_posh_FOUND)
+if(NOT iceoryx_hoofs_FOUND OR NOT iceoryx_posh_FOUND OR NOT iceoryx_dust_FOUND)
     if(iceoryx_hoofs_FOUND)
         message(FATAL_ERROR "iceoryx_hoofs was not found with 'find_package' but other parts were found!")
     endif()
+    if(iceoryx_dust_FOUND)
+        message(FATAL_ERROR "iceoryx_posh was not found with 'find_package' but other parts were found!")
+    endif()
     if(iceoryx_posh_FOUND)
         message(FATAL_ERROR "iceoryx_posh was not found with 'find_package' but other parts were found!")
     endif()
-
     include(FetchContent)
     FetchContent_Declare(
         iceoryx
         GIT_REPOSITORY https://github.com/eclipse-iceoryx/iceoryx.git
-        GIT_TAG v2.0.2
+        GIT_TAG be2272fee0b25ce203fa63cc3a93a740baaa4c73
     )
     FetchContent_GetProperties(iceoryx)
     if (NOT iceoryx_POPULATED)
@@ -51,10 +54,12 @@ endif()
 
 if(ICEORYX_WITH_FETCH_CONTENT)
     add_subdirectory(${iceoryx_SOURCE_DIR}/iceoryx_hoofs ${iceoryx_BINARY_DIR}/iceoryx_hoofs)
+    add_subdirectory(${iceoryx_SOURCE_DIR}/iceoryx_dust ${iceoryx_BINARY_DIR}/iceoryx_dust)
     add_subdirectory(${iceoryx_SOURCE_DIR}/iceoryx_posh  ${iceoryx_BINARY_DIR}/iceoryx_posh)
 
-    find_package(iceoryx_posh REQUIRED)
     find_package(iceoryx_hoofs REQUIRED)
+    find_package(iceoryx_dust REQUIRED)
+    find_package(iceoryx_posh REQUIRED)
 endif()
 
 include(IceoryxPlatform)

diff --git a/src/publisher.cpp b/src/publisher.cpp
@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "iceoryx_posh/popo/publisher.hpp"
-#include "iceoryx_hoofs/posix_wrapper/signal_watcher.hpp"
+#include "iceoryx_dust/posix_wrapper/signal_watcher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <cstdint>

diff --git a/src/subscriber.cpp b/src/subscriber.cpp
@@ -15,7 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "iceoryx_posh/popo/subscriber.hpp"
-#include "iceoryx_hoofs/posix_wrapper/signal_watcher.hpp"
+#include "iceoryx_dust/posix_wrapper/signal_watcher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <cstdint>