Skip to content

Commit 062967d

Browse files
committed
Fix FreeRTOS.h include error
1 parent 9077f72 commit 062967d

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

obc/shared/hal/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ else()
129129
endif()
130130

131131
add_library(${HAL_LIB_OPTIMIZE} STATIC)
132-
target_include_directories(${HAL_LIB_OPTIMIZE} PUBLIC ${HAL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
132+
target_include_directories(${HAL_LIB_OPTIMIZE} PUBLIC ${FREERTOS_INCLUDE_DIRS} ${HAL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
133133
add_library(${FREERTOS_LIB_OPTIMIZE} STATIC)
134134
target_include_directories(${FREERTOS_LIB_OPTIMIZE} PUBLIC ${FREERTOS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
135135
target_link_libraries(${FREERTOS_LIB_OPTIMIZE} PUBLIC ${HAL_LIB_OPTIMIZE})
@@ -148,10 +148,9 @@ endif()
148148
# Higher optimization levels on some hal files will break firmware for some reason
149149
# Compile them with no optimizations
150150
add_library(${HAL_LIB_NO_OPTIMIZE} OBJECT)
151-
target_include_directories(${HAL_LIB_NO_OPTIMIZE} PUBLIC ${HAL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
151+
target_include_directories(${HAL_LIB_NO_OPTIMIZE} PUBLIC ${FREERTOS_INCLUDE_DIRS} ${HAL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
152152
add_library(${FREERTOS_LIB_NO_OPTIMIZE} OBJECT)
153153
target_include_directories(${FREERTOS_LIB_NO_OPTIMIZE} PUBLIC ${FREERTOS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/common)
154-
# target_link_libraries(${FREERTOS_LIB_NO_OPTIMIZE} PUBLIC ${HAL_LIB_NO_OPTIMIZE})
155154

156155
target_sources(${HAL_LIB_NO_OPTIMIZE} PUBLIC ${NO_OPTIMIZE_SOURCES})
157156
target_compile_definitions(${HAL_LIB_NO_OPTIMIZE} PRIVATE

0 commit comments

Comments
 (0)