Fix Marvell CMake file
@@ -177,8 +177,9 @@ set(
"${mw320_dir}/sdk/src/wlan/wifidriver/incl"
"${AFR_KERNEL_DIR}/portable/GCC/ARM_CM4F"
"${mw320_dir}/sdk/src/incl/platform/os/freertos"
- "${AFR_MODULES_STANDARD_DIR}/freertos_plus_tcp/include"
- "${AFR_MODULES_STANDARD_DIR}/freertos_plus_tcp/source/portable/Compiler/GCC"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/freertos_plus_tcp/include"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/freertos_plus_tcp/source/portable/Compiler/GCC"
+ "$<IF:${AFR_IS_TESTING},${AFR_TESTS_DIR}/common/include,${AFR_DEMOS_DIR}/include>"
)
# Global include directories
@@ -199,8 +200,8 @@ afr_mcu_port(freertos_plus_tcp)
target_sources(
AFR::freertos_plus_tcp::mcu_port
INTERFACE
- "${AFR_MODULES_STANDARD_DIR}/freertos_plus_tcp/source/portable/BufferManagement/BufferAllocation_2.c"
- "${AFR_MODULES_STANDARD_DIR}/freertos_plus_tcp/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/freertos_plus_tcp/source/portable/BufferManagement/BufferAllocation_2.c"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/freertos_plus_tcp/source/portable/NetworkInterface/mw300_rd/NetworkInterface.c"
)
# PKCS11
@@ -225,15 +226,15 @@ target_link_libraries(
)
target_sources(
AFR::secure_sockets::mcu_port
- INTERFACE "${AFR_MODULES_PORTS_DIR}/secure_sockets/freertos_plus_tcp/aws_secure_sockets.c"
+ INTERFACE "${AFR_MODULES_ABSTRACTIONS_DIR}/secure_sockets/freertos_plus_tcp/aws_secure_sockets.c"
)
target_include_directories(
AFR::secure_sockets::mcu_port
INTERFACE
- "${AFR_MODULES_PORTS_DIR}/pkcs11/include"
+ "${AFR_MODULES_ABSTRACTIONS_DIR}/pkcs11/include"
"${AFR_3RDPARTY_DIR}/pkcs11"
- "${AFR_MODULES_STANDARD_DIR}/crypto/include"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/crypto/include"
)
# -------------------------------------------------------------------------------------------------
# Amazon FreeRTOS demos and tests
@@ -254,9 +255,9 @@ add_executable(
target_include_directories(
${exe_target}
PUBLIC
- "${AFR_MODULES_PORTS_DIR}/pkcs11/include"
+ "${AFR_MODULES_ABSTRACTIONS_DIR}/pkcs11/include"
"${AFR_3RDPARTY_DIR}/pkcs11"
- "${AFR_MODULES_STANDARD_DIR}/crypto/include"
+ "${AFR_MODULES_FREERTOS_PLUS_DIR}/standard/crypto/include"
)
target_link_libraries(
