From ce18225710b4f33bf77680c3422d92619c1c86bd Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Wed, 15 Aug 2018 14:21:52 -0400
Subject: [PATCH] cmake px4_add_module add unity build support

 - a unity build is a single compilation unit per module
---
 cmake/common/px4_base.cmake                   | 32 ++++++++++++++++---
 src/modules/mavlink/CMakeLists.txt            |  1 +
 .../mavlink/mavlink_tests/CMakeLists.txt      |  3 --
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 0b5b361094..aaf045c206 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -175,6 +175,7 @@ endfunction()
 #		INCLUDES		: include directories
 #		DEPENDS			: targets which this module depends on
 #		EXTERNAL		: flag to indicate that this module is out-of-tree
+#		UNITY_BUILD		: merge all source files and build this module as a single compilation unit
 #
 #	Output:
 #		Static library with name matching MODULE.
@@ -194,11 +195,34 @@ function(px4_add_module)
 		NAME px4_add_module
 		ONE_VALUE MODULE MAIN STACK STACK_MAIN STACK_MAX PRIORITY
 		MULTI_VALUE COMPILE_FLAGS LINK_FLAGS SRCS INCLUDES DEPENDS
-		OPTIONS EXTERNAL
+		OPTIONS EXTERNAL UNITY_BUILD
 		REQUIRED MODULE MAIN
 		ARGN ${ARGN})
 
-	add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${SRCS})
+	if(UNITY_BUILD AND (${OS} STREQUAL "nuttx"))
+		# build standalone test library to catch compilation errors and provide sane output
+		add_library(${MODULE}_original STATIC EXCLUDE_FROM_ALL ${SRCS})
+		if(DEPENDS)
+			add_dependencies(${MODULE}_original ${DEPENDS})
+		endif()
+
+		if(INCLUDES)
+			target_include_directories(${MODULE}_original PRIVATE ${INCLUDES})
+		endif()
+
+		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp
+			COMMAND cat ${SRCS} > ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp
+			DEPENDS ${MODULE}_original ${DEPENDS} ${SRCS}
+			COMMENT "${MODULE} merging source"
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			)
+		set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp PROPERTIES GENERATED true)
+
+		add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${MODULE}_unity.cpp)
+		target_include_directories(${MODULE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+	else()
+		add_library(${MODULE} STATIC EXCLUDE_FROM_ALL ${SRCS})
+	endif()
 
 	# all modules can potentially use parameters and uORB
 	add_dependencies(${MODULE} uorb_headers)
@@ -230,9 +254,9 @@ function(px4_add_module)
 	endif()
 	set_target_properties(${MODULE} PROPERTIES STACK_MAX ${STACK_MAX})
 
-	if(${OS} STREQUAL "qurt" )
+	if(${OS} STREQUAL "qurt")
 		set_property(TARGET ${MODULE} PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-	elseif(${OS} STREQUAL "nuttx" )
+	elseif(${OS} STREQUAL "nuttx")
 		target_compile_options(${MODULE} PRIVATE -Wframe-larger-than=${STACK_MAX})
 	endif()
 
diff --git a/src/modules/mavlink/CMakeLists.txt b/src/modules/mavlink/CMakeLists.txt
index 0f575202ea..da98701e6a 100644
--- a/src/modules/mavlink/CMakeLists.txt
+++ b/src/modules/mavlink/CMakeLists.txt
@@ -66,4 +66,5 @@ px4_add_module(
 		git_ecl
 		ecl_geo
 		version
+	UNITY_BUILD
 	)
diff --git a/src/modules/mavlink/mavlink_tests/CMakeLists.txt b/src/modules/mavlink/mavlink_tests/CMakeLists.txt
index 225806aaf0..5989f366e0 100644
--- a/src/modules/mavlink/mavlink_tests/CMakeLists.txt
+++ b/src/modules/mavlink/mavlink_tests/CMakeLists.txt
@@ -47,7 +47,4 @@ px4_add_module(
 		mavlink_ftp_test.cpp
 		../mavlink_stream.cpp
 		../mavlink_ftp.cpp
-		../mavlink.c
-	DEPENDS
 	)
-