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

CMake: Move libopencm3 dependency out of CMake include file.

Browse Source 
Don't declare the libopencm3 target once from each project subdirectory. CMake will complain terribly.
This commit is contained in:
Jared Boone
2019-01-22 15:21:43 -08:00
parent 65b41fb80e
commit e433bee0b8
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/CMakeLists.txt
View File

@ -25,5 +25,20 @@ 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)

15
firmware/hackrf-common.cmake
View File

@ -27,12 +27,6 @@
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)
#set(VERSION "") #set(VERSION "")
@ -110,15 +104,6 @@ set(BUILD_SHARED_LIBS OFF)
include_directories("${LIBOPENCM3}/include/") include_directories("${LIBOPENCM3}/include/")
include_directories("${PATH_HACKRF_FIRMWARE_COMMON}") include_directories("${PATH_HACKRF_FIRMWARE_COMMON}")
include(ExternalProject)
ExternalProject_Add(libopencm3
SOURCE_DIR "${LIBOPENCM3}"
BUILD_IN_SOURCE true
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ""
INSTALL_COMMAND ""
)
macro(DeclareTargets) macro(DeclareTargets)
SET(SRC_M4 SET(SRC_M4
${SRC_M4} ${SRC_M4}