Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for avoiding conflicting libopencm3 targets

Browse Source
This commit is contained in:
Dominic Spill
2019-01-30 15:29:17 -07:00
parent 62efaf5ddb
commit 31079258e9
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/CMakeLists.txt
View File

@ -25,20 +25,5 @@ set(CMAKE_TOOLCHAIN_FILE toolchain-arm-cortex-m.cmake)
project (hackrf_firmware_all C) project (hackrf_firmware_all C)
SET(PATH_HACKRF_FIRMWARE ${CMAKE_CURRENT_LIST_DIR})
SET(PATH_HACKRF ${PATH_HACKRF_FIRMWARE}/..)
SET(PATH_HACKRF_FIRMWARE_COMMON ${PATH_HACKRF_FIRMWARE}/common)
SET(LIBOPENCM3 ${PATH_HACKRF_FIRMWARE}/libopencm3)
SET(PATH_DFU_PY ${PATH_HACKRF_FIRMWARE}/dfu.py)
include(ExternalProject)
ExternalProject_Add(libopencm3
SOURCE_DIR "${LIBOPENCM3}"
BUILD_IN_SOURCE true
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ""
INSTALL_COMMAND ""
)
add_subdirectory(blinky) add_subdirectory(blinky)
add_subdirectory(hackrf_usb) add_subdirectory(hackrf_usb)

21
firmware/hackrf-common.cmake
View File

@ -27,8 +27,23 @@
enable_language(C CXX ASM) enable_language(C CXX ASM)
SET(PATH_HACKRF_FIRMWARE ${CMAKE_CURRENT_LIST_DIR})
SET(PATH_HACKRF ${PATH_HACKRF_FIRMWARE}/..)
SET(PATH_HACKRF_FIRMWARE_COMMON ${PATH_HACKRF_FIRMWARE}/common)
SET(LIBOPENCM3 ${PATH_HACKRF_FIRMWARE}/libopencm3)
SET(PATH_DFU_PY ${PATH_HACKRF_FIRMWARE}/dfu.py)
include(${PATH_HACKRF_FIRMWARE}/dfu-util.cmake) include(${PATH_HACKRF_FIRMWARE}/dfu-util.cmake)
include(ExternalProject)
ExternalProject_Add(libopencm3_${PROJECT_NAME}
SOURCE_DIR "${LIBOPENCM3}"
BUILD_IN_SOURCE true
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ""
INSTALL_COMMAND ""
)
#set(VERSION "") #set(VERSION "")
if (NOT DEFINED VERSION) if (NOT DEFINED VERSION)
execute_process( execute_process(
@ -159,7 +174,7 @@ macro(DeclareTargets)
) )
add_executable(${PROJECT_NAME}_m0.elf ${SRC_M0}) add_executable(${PROJECT_NAME}_m0.elf ${SRC_M0})
add_dependencies(${PROJECT_NAME}_m0.elf libopencm3) add_dependencies(${PROJECT_NAME}_m0.elf libopencm3_${PROJECT_NAME})
target_link_libraries( target_link_libraries(
${PROJECT_NAME}_m0.elf ${PROJECT_NAME}_m0.elf
@ -182,7 +197,7 @@ macro(DeclareTargets)
set_target_properties(${PROJECT_NAME}_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4}") set_target_properties(${PROJECT_NAME}_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4}")
add_dependencies(${PROJECT_NAME}_objects ${PROJECT_NAME}_m0.bin) add_dependencies(${PROJECT_NAME}_objects ${PROJECT_NAME}_m0.bin)
add_executable(${PROJECT_NAME}.elf $<TARGET_OBJECTS:${PROJECT_NAME}_objects>) add_executable(${PROJECT_NAME}.elf $<TARGET_OBJECTS:${PROJECT_NAME}_objects>)
add_dependencies(${PROJECT_NAME}.elf libopencm3) add_dependencies(${PROJECT_NAME}.elf libopencm3_${PROJECT_NAME})
target_link_libraries( target_link_libraries(
${PROJECT_NAME}.elf ${PROJECT_NAME}.elf
@ -206,7 +221,7 @@ macro(DeclareTargets)
set_target_properties(${PROJECT_NAME}_dfu_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4_DFU}") set_target_properties(${PROJECT_NAME}_dfu_objects PROPERTIES COMPILE_FLAGS "${CFLAGS_M4_DFU}")
add_dependencies(${PROJECT_NAME}_dfu_objects ${PROJECT_NAME}_m0.bin) add_dependencies(${PROJECT_NAME}_dfu_objects ${PROJECT_NAME}_m0.bin)
add_executable(${PROJECT_NAME}_dfu.elf $<TARGET_OBJECTS:${PROJECT_NAME}_dfu_objects>) add_executable(${PROJECT_NAME}_dfu.elf $<TARGET_OBJECTS:${PROJECT_NAME}_dfu_objects>)
add_dependencies(${PROJECT_NAME}_dfu.elf libopencm3) add_dependencies(${PROJECT_NAME}_dfu.elf libopencm3_${PROJECT_NAME})
target_link_libraries( target_link_libraries(
${PROJECT_NAME}_dfu.elf ${PROJECT_NAME}_dfu.elf