Skip to content

Commit 91f6a29

Browse files
drivers: uavcan: fix TFLM c library conflict
With NuttX 12.12.0 the TFLM c library causes a conflict
1 parent a050d39 commit 91f6a29

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/drivers/uavcan/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ if(NOT config_uavcan_num_ifaces)
7171
message(FATAL_ERROR "config_uavcan_num_ifaces not set")
7272
endif()
7373

74+
if(CONFIG_LIB_TFLM)
75+
set(UAVCAN_IMPLEMENT_PLACEMENT_NEW 0)
76+
else()
77+
set(UAVCAN_IMPLEMENT_PLACEMENT_NEW 1)
78+
endif()
79+
7480
string(TOUPPER "${PX4_PLATFORM}" OS_UPPER)
7581
string(TOUPPER "${UAVCAN_DRIVER}" UAVCAN_DRIVER_UPPER)
7682
add_definitions(
@@ -80,7 +86,7 @@ add_definitions(
8086
-DUAVCAN_NUM_IFACES=${config_uavcan_num_ifaces}
8187
-DUAVCAN_CPP_VERSION=UAVCAN_CPP03
8288
-DUAVCAN_DRIVER=uavcan_${UAVCAN_DRIVER}
83-
-DUAVCAN_IMPLEMENT_PLACEMENT_NEW=1
89+
-DUAVCAN_IMPLEMENT_PLACEMENT_NEW=${UAVCAN_IMPLEMENT_PLACEMENT_NEW}
8490
-DUAVCAN_MEM_POOL_BLOCK_SIZE=48
8591
-DUAVCAN_NO_ASSERTIONS
8692
-DUAVCAN_PLATFORM=${UAVCAN_PLATFORM}

0 commit comments

Comments
 (0)