From 7b6811ca5496ca929f11b1d8a2a8716dd5dfd4af Mon Sep 17 00:00:00 2001
From: Mark Charlebois <charlebm@gmail.com>
Date: Fri, 22 Jan 2016 10:17:43 -0800
Subject: [PATCH] Removed EAGLE_ADD_ON dependency

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
---
 cmake/configs/qurt_eagle_release.cmake | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/cmake/configs/qurt_eagle_release.cmake b/cmake/configs/qurt_eagle_release.cmake
index 7517df4e22..8af26f012a 100644
--- a/cmake/configs/qurt_eagle_release.cmake
+++ b/cmake/configs/qurt_eagle_release.cmake
@@ -1,10 +1,10 @@
 include(qurt/px4_impl_qurt)
 
-if ("$ENV{EAGLE_ADDON_ROOT}" STREQUAL "")
-	message(FATAL_ERROR "Enviroment variable EAGLE_ADDON_ROOT must be set")
-else()
-	set(EAGLE_ADDON_ROOT $ENV{EAGLE_ADDON_ROOT})
-endif()
+#if ("$ENV{EAGLE_ADDON_ROOT}" STREQUAL "")
+#	message(FATAL_ERROR "Enviroment variable EAGLE_ADDON_ROOT must be set")
+#else()
+#	set(EAGLE_ADDON_ROOT $ENV{EAGLE_ADDON_ROOT})
+#endif()
 
 if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "")
 	message(FATAL_ERROR "Enviroment variable HEXAGON_SDK_ROOT must be set")
@@ -21,8 +21,12 @@ endif()
 STRING(REGEX REPLACE "//" "/" EAGLE_DRIVERS_SRC ${EAGLE_DRIVERS_SRC})
 STRING(REGEX REPLACE "/" "__" EAGLE_DRIVERS_MODULE_PREFIX ${EAGLE_DRIVERS_SRC})
 
-include_directories(${EAGLE_ADDON_ROOT}/flight_controller/hexagon/inc)
-include_directories(${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include)
+#include_directories(${EAGLE_ADDON_ROOT}/flight_controller/hexagon/inc)
+include_directories(
+	${HEXAGON_SDK_ROOT}/inc
+	${HEXAGON_SDK_ROOT}/inc/stddef
+	${HEXAGON_SDK_ROOT}/lib/common/qurt/ADSPv5MP/include
+	)
 
 message("hexagon_sdk_root is ${HEXAGON_SDK_ROOT}")
 
@@ -30,9 +34,9 @@ set(QURT_ENABLE_STUBS "0")
 
 set(CONFIG_SHMEM "1")
 
+#-L${EAGLE_ADDON_ROOT}/flight_controller/hexagon/libs 
 # For Actual flight we need to link against the driver dynamic libraries
 set(target_libraries
-	-L${EAGLE_ADDON_ROOT}/flight_controller/hexagon/libs 
 	mpu9x50
 	uart_esc
 	csr_gps
@@ -49,10 +53,10 @@ set(config_module_list
 	#
 	drivers/device
 	modules/sensors
-	${EAGLE_DRIVERS_SRC}/mpu9x50
+	#${EAGLE_DRIVERS_SRC}/mpu9x50
 	${EAGLE_DRIVERS_SRC}/uart_esc
-	${EAGLE_DRIVERS_SRC}/rc_receiver
-	${EAGLE_DRIVERS_SRC}/csr_gps
+	#${EAGLE_DRIVERS_SRC}/rc_receiver
+	#${EAGLE_DRIVERS_SRC}/csr_gps
 
 	#
 	# System commands