Fix incorrect relative paths in Cmake files (#837)

This was reported here - https://github.com/FreeRTOS/FreeRTOS/issues/812

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
pull/838/head
Gaurav-Aggarwal-AWS 3 years ago committed by GitHub
parent 4242c47a8d
commit 5890286b30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -34,7 +34,7 @@ if (NOT FREERTOS_KERNEL_PATH)
foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source) foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source)
# check if FreeRTOS-Kernel exists under directory that included us # check if FreeRTOS-Kernel exists under directory that included us
set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}}) set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}})
set(SEARCH_ROOT ../../../..) set(SEARCH_ROOT ../../../../..)
get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH) get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH)
if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt) if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt)
get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH) get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH)

@ -17,21 +17,21 @@ add_executable(main_full
main_full.c main_full.c
IntQueueTimer.c IntQueueTimer.c
RegTest.s RegTest.s
../../Common/Minimal/blocktim.c ../../../../Common/Minimal/blocktim.c
../../Common/Minimal/countsem.c ../../../../Common/Minimal/countsem.c
../../Common/Minimal/dynamic.c ../../../../Common/Minimal/dynamic.c
../../Common/Minimal/recmutex.c ../../../../Common/Minimal/recmutex.c
../../Common/Minimal/QueueOverwrite.c ../../../../Common/Minimal/QueueOverwrite.c
../../Common/Minimal/EventGroupsDemo.c ../../../../Common/Minimal/EventGroupsDemo.c
../../Common/Minimal/IntSemTest.c ../../../../Common/Minimal/IntSemTest.c
../../Common/Minimal/IntQueue.c ../../../../Common/Minimal/IntQueue.c
../../Common/Minimal/TaskNotify.c ../../../../Common/Minimal/TaskNotify.c
../../Common/Minimal/TimerDemo.c ../../../../Common/Minimal/TimerDemo.c
../../Common/Minimal/GenQTest.c ../../../../Common/Minimal/GenQTest.c
../../Common/Minimal/death.c ../../../../Common/Minimal/death.c
../../Common/Minimal/semtest.c ../../../../Common/Minimal/semtest.c
../../Common/Minimal/BlockQ.c ../../../../Common/Minimal/BlockQ.c
../../Common/Minimal/flop.c ../../../../Common/Minimal/flop.c
) )
target_compile_definitions(main_full PRIVATE target_compile_definitions(main_full PRIVATE
@ -40,7 +40,7 @@ target_compile_definitions(main_full PRIVATE
target_include_directories(main_full PRIVATE target_include_directories(main_full PRIVATE
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/../../Common/include) ${CMAKE_CURRENT_LIST_DIR}/../../../../Common/include)
target_compile_definitions(main_full PRIVATE target_compile_definitions(main_full PRIVATE
PICO_STDIO_STACK_BUFFER_SIZE=64 # use a small printf on stack buffer 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 target_include_directories(main_blinky PRIVATE
${CMAKE_CURRENT_LIST_DIR} ${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) target_link_libraries(main_blinky pico_stdlib FreeRTOS-Kernel FreeRTOS-Kernel-Heap1)
pico_add_extra_outputs(main_blinky) pico_add_extra_outputs(main_blinky)
Loading…
Cancel
Save