From d0c89b8396e407d63964b410b44119aec3ae8b9b Mon Sep 17 00:00:00 2001
From: James Goppert <james.goppert@gmail.com>
Date: Wed, 9 Sep 2015 23:11:25 -0400
Subject: [PATCH] Attempted to fix qurt build, some cleanup of old module
 funcs.

---
 cmake/posix/px4_impl_posix.cmake | 37 --------------------------------
 cmake/qurt/px4_impl_qurt.cmake   | 28 ------------------------
 src/firmware/qurt/CMakeLists.txt | 13 +----------
 3 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/cmake/posix/px4_impl_posix.cmake b/cmake/posix/px4_impl_posix.cmake
index 335652aa5b..ed97ab9cb7 100644
--- a/cmake/posix/px4_impl_posix.cmake
+++ b/cmake/posix/px4_impl_posix.cmake
@@ -223,40 +223,3 @@ function(px4_os_prebuild_targets)
 			ARGN ${ARGN})
 	add_custom_target(${OUT})
 endfunction()
-
-#=============================================================================
-#
-#	px4_posix_add_modules
-#
-#	This function adds target modules
-#
-#	Usage:
-#		px4_os_prebuild_targets(
-#			OUT_MODULES <module-subdir-list>
-#			BOARD <in-string>
-#			)
-#
-#	Input:
-#		BOARD 		: board
-#
-#	Output:
-#		OUT_MODULES	: the updated module list
-#
-#	Example:
-#		px4_posix_add_modules(module_list "hil")
-#
-function(px4_posix_add_modules OUT_MODULES BOARD)
-	include(config-posix-${BOARD})
-	set(config_modules)
-	px4_set_config_modules(config_modules)
-	set(${OUT_MODULES} ${${OUT_MODULES}} ${config_modules} PARENT_SCOPE)
-endfunction()
-
-
-macro(px4_target_firmware)
-	set(installed_targets)
-	add_executable(main ./src/platforms/posix/main.cpp)
-	target_link_libraries(main ${module_list} ${EXE_LINK_LIBS} ${module_list} ${EXE_LINK_LIBS})
-	list(APPEND installed_targets main)
-endmacro()
-
diff --git a/cmake/qurt/px4_impl_qurt.cmake b/cmake/qurt/px4_impl_qurt.cmake
index 407dc6414d..8fdc3324f5 100644
--- a/cmake/qurt/px4_impl_qurt.cmake
+++ b/cmake/qurt/px4_impl_qurt.cmake
@@ -231,32 +231,4 @@ function(px4_os_prebuild_targets)
 		COMMAND patch -p1 -i ../../../cmake/qurt/qurt_eigen.patch)
 endfunction()
 
-#=============================================================================
-#
-#	px4_qurt_add_modules
-#
-#	This function adds target modules
-#
-#	Usage:
-#		px4_os_prebuild_targets(
-#			OUT_MODULES <module-subdir-list>
-#			BOARD <in-string>
-#			)
-#
-#	Input:
-#		BOARD 		: board
-#
-#	Output:
-#		OUT_MODULES	: the updated module list
-#
-#	Example:
-#		px4_qurt_add_modules(module_list "hil")
-#
-function(px4_qurt_add_modules OUT_MODULES BOARD)
-	include(config-qurt-${BOARD})
-	set(config_modules)
-	px4_set_config_modules(config_modules)
-	set(${OUT_MODULES} ${${OUT_MODULES}} ${config_modules} PARENT_SCOPE)
-endfunction()
-
 # vim: set noet fenc=utf-8 ff=unix nowrap:
diff --git a/src/firmware/qurt/CMakeLists.txt b/src/firmware/qurt/CMakeLists.txt
index ac8de03c92..dd5b09a39b 100644
--- a/src/firmware/qurt/CMakeLists.txt
+++ b/src/firmware/qurt/CMakeLists.txt
@@ -4,21 +4,10 @@ set(V_ARCH v5)
 set(HEXAGON_TOOLS_ROOT /opt/6.4.03)
 set(TOOLSLIB 
 	${HEXAGON_TOOLS_ROOT}/dinkumware/lib/${V_ARCH}/G0)
-set(module_dir_list)
-set(module_list)
-px4_qurt_add_modules(module_dir_list ${BOARD})
-message(STATUS "module list: ${module_dir_list}")
-
-foreach(directory ${module_dir_list})
-	message(STATUS "directory: ${directory}")
-	px4_mangle_name(${directory} mangled_name)
-	list(APPEND module_list
-		${mangled_name})
-endforeach()
 
 px4_qurt_generate_builtin_commands(
 	OUT ${CMAKE_BINARY_DIR}/apps.h
-	MODULE_LIST ${module_list})
+	MODULE_LIST ${module_libraries})
 
 # FIXME @jgoppert - how to work around issues like this?
 # Without changing global variables?