Force board_lib to depend on minimal_board_lib

This should fix race conditions with dependencies on the JSON file.
EdgeTX · Aug 13, 2023 · ee17c03 · ee17c03
1 parent 760e954
commit ee17c03
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/radio/src/boards/generic_stm32/CMakeLists.txt b/radio/src/boards/generic_stm32/CMakeLists.txt
@@ -30,10 +30,12 @@ set(BOARD_LIB_SRC
 )
 
 add_library(minimal_board_lib OBJECT EXCLUDE_FROM_ALL ${MINIMAL_BOARD_LIB_SRC})
-add_library(board_lib OBJECT EXCLUDE_FROM_ALL ${BOARD_LIB_SRC})
 
-set(FIRMWARE_SRC ${FIRMWARE_SRC}
+add_library(board_lib OBJECT EXCLUDE_FROM_ALL
   $<TARGET_OBJECTS:minimal_board_lib>
+  ${BOARD_LIB_SRC})
+
+set(FIRMWARE_SRC ${FIRMWARE_SRC}
   $<TARGET_OBJECTS:board_lib>
 )