From cd24e01d7514c5a5f8fbad96c010e5ddeb491750 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sun, 30 Dec 2018 14:11:11 -0800 Subject: [PATCH] CMake: Put libopencm3 dependencies in the right place. --- firmware/hackrf-common.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake index 9c3d48d6..402e9c6c 100644 --- a/firmware/hackrf-common.cmake +++ b/firmware/hackrf-common.cmake @@ -170,6 +170,7 @@ macro(DeclareTargets) ) add_executable(${PROJECT_NAME}_m0.elf ${SRC_M0}) + add_dependencies(${PROJECT_NAME}_m0.elf libopencm3) target_link_libraries( ${PROJECT_NAME}_m0.elf @@ -190,8 +191,9 @@ macro(DeclareTargets) # Object files to be linked for SPI flash versions add_library(${PROJECT_NAME}_objects OBJECT ${SRC_M4} m0_bin.s) set_target_properties(${PROJECT_NAME}_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4}") - add_dependencies(${PROJECT_NAME}_objects ${PROJECT_NAME}_m0.bin libopencm3) + add_dependencies(${PROJECT_NAME}_objects ${PROJECT_NAME}_m0.bin) add_executable(${PROJECT_NAME}.elf $) + add_dependencies(${PROJECT_NAME}.elf libopencm3) target_link_libraries( ${PROJECT_NAME}.elf @@ -213,8 +215,9 @@ macro(DeclareTargets) # Object files to be linked for DFU flash versions add_library(${PROJECT_NAME}_dfu_objects OBJECT ${SRC_M4} m0_bin.s) set_target_properties(${PROJECT_NAME}_dfu_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4_DFU}") - add_dependencies(${PROJECT_NAME}_dfu_objects ${PROJECT_NAME}_m0.bin libopencm3) + add_dependencies(${PROJECT_NAME}_dfu_objects ${PROJECT_NAME}_m0.bin) add_executable(${PROJECT_NAME}_dfu.elf $) + add_dependencies(${PROJECT_NAME}_dfu.elf libopencm3) target_link_libraries( ${PROJECT_NAME}_dfu.elf