From 5890286b306185e67bc7a01d8f8a222232fdee99 Mon Sep 17 00:00:00 2001 From: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com> Date: Mon, 8 Aug 2022 21:22:35 +0530 Subject: [PATCH] Fix incorrect relative paths in Cmake files (#837) This was reported here - https://github.com/FreeRTOS/FreeRTOS/issues/812 Signed-off-by: Gaurav Aggarwal --- .../OnEitherCore/FreeRTOS_Kernel_import.cmake | 2 +- .../CORTEX_M0+_RP2040/Standard/CMakeLists.txt | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/OnEitherCore/FreeRTOS_Kernel_import.cmake b/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/OnEitherCore/FreeRTOS_Kernel_import.cmake index dc68ed0387..b4997c07af 100644 --- a/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/OnEitherCore/FreeRTOS_Kernel_import.cmake +++ b/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/OnEitherCore/FreeRTOS_Kernel_import.cmake @@ -34,7 +34,7 @@ if (NOT FREERTOS_KERNEL_PATH) foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source) # check if FreeRTOS-Kernel exists under directory that included us set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}}) - set(SEARCH_ROOT ../../../..) + set(SEARCH_ROOT ../../../../..) get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH) if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt) get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH) diff --git a/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/Standard/CMakeLists.txt b/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/Standard/CMakeLists.txt index 6fc7bd8ce7..c6650cccdd 100644 --- a/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/Standard/CMakeLists.txt +++ b/FreeRTOS/Demo/ThirdParty/Community-Supported/CORTEX_M0+_RP2040/Standard/CMakeLists.txt @@ -17,21 +17,21 @@ add_executable(main_full main_full.c IntQueueTimer.c RegTest.s - ../../Common/Minimal/blocktim.c - ../../Common/Minimal/countsem.c - ../../Common/Minimal/dynamic.c - ../../Common/Minimal/recmutex.c - ../../Common/Minimal/QueueOverwrite.c - ../../Common/Minimal/EventGroupsDemo.c - ../../Common/Minimal/IntSemTest.c - ../../Common/Minimal/IntQueue.c - ../../Common/Minimal/TaskNotify.c - ../../Common/Minimal/TimerDemo.c - ../../Common/Minimal/GenQTest.c - ../../Common/Minimal/death.c - ../../Common/Minimal/semtest.c - ../../Common/Minimal/BlockQ.c - ../../Common/Minimal/flop.c + ../../../../Common/Minimal/blocktim.c + ../../../../Common/Minimal/countsem.c + ../../../../Common/Minimal/dynamic.c + ../../../../Common/Minimal/recmutex.c + ../../../../Common/Minimal/QueueOverwrite.c + ../../../../Common/Minimal/EventGroupsDemo.c + ../../../../Common/Minimal/IntSemTest.c + ../../../../Common/Minimal/IntQueue.c + ../../../../Common/Minimal/TaskNotify.c + ../../../../Common/Minimal/TimerDemo.c + ../../../../Common/Minimal/GenQTest.c + ../../../../Common/Minimal/death.c + ../../../../Common/Minimal/semtest.c + ../../../../Common/Minimal/BlockQ.c + ../../../../Common/Minimal/flop.c ) target_compile_definitions(main_full PRIVATE @@ -40,7 +40,7 @@ target_compile_definitions(main_full PRIVATE target_include_directories(main_full PRIVATE ${CMAKE_CURRENT_LIST_DIR} - ${CMAKE_CURRENT_LIST_DIR}/../../Common/include) + ${CMAKE_CURRENT_LIST_DIR}/../../../../Common/include) target_compile_definitions(main_full PRIVATE PICO_STDIO_STACK_BUFFER_SIZE=64 # use a small printf on stack buffer @@ -59,7 +59,7 @@ target_compile_definitions(main_blinky PRIVATE target_include_directories(main_blinky PRIVATE ${CMAKE_CURRENT_LIST_DIR} - ${CMAKE_CURRENT_LIST_DIR}/../../Common/include) + ${CMAKE_CURRENT_LIST_DIR}/../../../../Common/include) target_link_libraries(main_blinky pico_stdlib FreeRTOS-Kernel FreeRTOS-Kernel-Heap1) pico_add_extra_outputs(main_blinky) \ No newline at end of file