Przeglądaj źródła

FindFreeRTOS works when FREERTOS_PATH is the repo FreeRTOS/FreeRTOS too.

Before this change this var could only by FreeRTOS-Kernel.
Hish15 5 lat temu
rodzic
commit
a87d56dce5
1 zmienionych plików z 6 dodań i 3 usunięć
  1. 6 3
      cmake/FindFreeRTOS.cmake

+ 6 - 3
cmake/FindFreeRTOS.cmake

@@ -14,14 +14,16 @@ endif()
 
 
 find_path(FreeRTOS_COMMON_INCLUDE
 find_path(FreeRTOS_COMMON_INCLUDE
     NAMES FreeRTOS.h
     NAMES FreeRTOS.h
-    PATHS "${FREERTOS_PATH}/Source/include"
+    PATHS "${FREERTOS_PATH}" "${FREERTOS_PATH}/FreeRTOS" 
+    PATH_SUFFIXES  "Source/include"
     NO_DEFAULT_PATH
     NO_DEFAULT_PATH
 )
 )
 list(APPEND FreeRTOS_INCLUDE_DIRS "${FreeRTOS_COMMON_INCLUDE}")
 list(APPEND FreeRTOS_INCLUDE_DIRS "${FreeRTOS_COMMON_INCLUDE}")
 
 
 find_path(FreeRTOS_SOURCE_DIR
 find_path(FreeRTOS_SOURCE_DIR
     NAMES tasks.c
     NAMES tasks.c
-    PATHS "${FREERTOS_PATH}/Source"
+    PATHS "${FREERTOS_PATH}" "${FREERTOS_PATH}/FreeRTOS" 
+    PATH_SUFFIXES  "Source"
     NO_DEFAULT_PATH
     NO_DEFAULT_PATH
 )
 )
 if(NOT (TARGET FreeRTOS))
 if(NOT (TARGET FreeRTOS))
@@ -69,7 +71,8 @@ endforeach()
 foreach(PORT ${FreeRTOS_FIND_COMPONENTS})
 foreach(PORT ${FreeRTOS_FIND_COMPONENTS})
     find_path(FreeRTOS_${PORT}_PATH
     find_path(FreeRTOS_${PORT}_PATH
         NAMES portmacro.h
         NAMES portmacro.h
-        PATHS "${FREERTOS_PATH}/Source/portable/GCC/${PORT}"
+        PATHS "${FREERTOS_PATH}" "${FREERTOS_PATH}/FreeRTOS" 
+        PATH_SUFFIXES "Source/portable/GCC/${PORT}"
         NO_DEFAULT_PATH
         NO_DEFAULT_PATH
     )
     )
     list(APPEND FreeRTOS_INCLUDE_DIRS "${FreeRTOS_${PORT}_PATH}")
     list(APPEND FreeRTOS_INCLUDE_DIRS "${FreeRTOS_${PORT}_PATH}")