From e433bee0b8ccdb167316bc27d09dd7b5c5985188 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 22 Jan 2019 15:21:43 -0800
Subject: [PATCH] CMake: Move libopencm3 dependency out of CMake include file.

Don't declare the libopencm3 target once from each project subdirectory. CMake will complain terribly.
---
 firmware/CMakeLists.txt      | 15 +++++++++++++++
 firmware/hackrf-common.cmake | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
index c458b7f1..96bee97e 100644
--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -25,5 +25,20 @@ set(CMAKE_TOOLCHAIN_FILE toolchain-arm-cortex-m.cmake)
 
 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(hackrf_usb)
diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake
index add10b23..ebd853a5 100644
--- a/firmware/hackrf-common.cmake
+++ b/firmware/hackrf-common.cmake
@@ -27,12 +27,6 @@
 
 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)
 
 #set(VERSION "")
@@ -110,15 +104,6 @@ set(BUILD_SHARED_LIBS OFF)
 include_directories("${LIBOPENCM3}/include/")
 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)
 	SET(SRC_M4
 		${SRC_M4}