From f7688ce709e53f408e30706ebc27bd052c03d693 Mon Sep 17 00:00:00 2001 From: Patrick Masselink <patrick.masselink@zettascale.tech> Date: Thu, 3 Aug 2023 11:46:18 +0200 Subject: [PATCH] Improve Zephyr port in-tree build support Signed-off-by: Patrick Masselink <patrick.masselink@zettascale.tech> --- ports/zephyr/CMakeLists.txt | 1 - ports/zephyr/README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt index 7d81316fda..ddb55cbdb2 100644 --- a/ports/zephyr/CMakeLists.txt +++ b/ports/zephyr/CMakeLists.txt @@ -64,7 +64,6 @@ set(CDDS_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/cyclonedds-prefix/include) ExternalProject_Add(cyclonedds SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../ - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../ BUILD_COMMAND ${CMAKE_COMMAND} --build . CMAKE_ARGS -DBUILD_SHARED_LIBS=0 -DENABLE_SECURITY=0 -DENABLE_SSL=0 -DENABLE_SOURCE_SPECIFIC_MULTICAST=0 -DENABLE_IPV6=1 -DENABLE_SHM=0 -DWITH_ZEPHYR=1 diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md index b66ee02347..14cc50b70d 100644 --- a/ports/zephyr/README.md +++ b/ports/zephyr/README.md @@ -33,5 +33,5 @@ The CycloneDDS configuration in `config.xml` is automatically converted to a cha Alternatively, [dds_create_domain_with_rawconfig](https://cyclonedds.io/docs/cyclonedds/latest/api/domain.html?#c.dds_create_domain_with_rawconfig) can be used without XML configuration data. ## Zephyr versions -At the time of writing, CycloneDDS has been tested on Zephyr [v3.3.0](https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.3.0) and [v3.4.0](https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.4.0). However, for the NXP X-S32Z27X-DC board an issue exists in `v3.4.0` that can cause CycloneDDS to crash. This is fixed on the Zephyr main branch, therefore we suggest using zephyrproject-rtos/zephyr@14342969150a35f3c26afa513a4725bdec310799. +At the time of writing, CycloneDDS has been tested on Zephyr [v3.3.0](https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.3.0) and [v3.4.0](https://github.com/zephyrproject-rtos/zephyr/releases/tag/v3.4.0). However, for the NXP X-S32Z27X-DC board an issue exists in `v3.4.0` that can cause CycloneDDS to crash. This is fixed on the Zephyr main branch, therefore we suggest using [@143429](https://github.com/zephyrproject-rtos/zephyr/commit/14342969150a35f3c26afa513a4725bdec310799).