From 822fc5725c284b68fdf70dd9700f4108a7fd09a0 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Tue, 21 Nov 2017 01:56:27 -0500
Subject: [PATCH] cmake px4_add_module() make properties private

---
 cmake/common/px4_base.cmake | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 430a9c385a..54f553ba40 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -205,12 +205,6 @@ function(px4_add_module)
 	set(STACK_MAIN_DEFAULT 1024)
 	set(PRIORITY_DEFAULT SCHED_PRIORITY_DEFAULT)
 
-	# default stack max to stack main
-	if(NOT STACK_MAIN AND STACK)
-		set(STACK_MAIN ${STACK})
-		message(AUTHOR_WARNING "STACK deprecated, USE STACK_MAIN instead!")
-	endif()
-
 	foreach(property MAIN STACK_MAIN PRIORITY)
 		if(NOT ${property})
 			set(${property} ${${property}_DEFAULT})
@@ -227,15 +221,18 @@ function(px4_add_module)
 	if(${OS} STREQUAL "qurt" )
 		set_property(TARGET ${MODULE} PROPERTY POSITION_INDEPENDENT_CODE TRUE)
 	elseif(${OS} STREQUAL "nuttx" )
-		list(APPEND COMPILE_FLAGS -Wframe-larger-than=${STACK_MAX})
+		target_compile_options(${MODULE} PRIVATE -Wframe-larger-than=${STACK_MAX})
 	endif()
 
 	if(MAIN)
-		set_target_properties(${MODULE} PROPERTIES
-			COMPILE_DEFINITIONS PX4_MAIN=${MAIN}_app_main)
-		add_definitions(-DMODULE_NAME="${MAIN}")
+		target_compile_definitions(${MODULE} PRIVATE PX4_MAIN=${MAIN}_app_main)
+		target_compile_definitions(${MODULE} PRIVATE MODULE_NAME="${MAIN}")
 	else()
-		add_definitions(-DMODULE_NAME="${MODULE}")
+		target_compile_definitions(${MODULE} PRIVATE MODULE_NAME="${MODULE}")
+	endif()
+
+	if(COMPILE_FLAGS)
+		target_compile_options(${MODULE} PRIVATE ${COMPILE_FLAGS})
 	endif()
 
 	if(INCLUDES)
@@ -247,7 +244,7 @@ function(px4_add_module)
 	endif()
 
 	# join list variables to get ready to send to compiler
-	foreach(prop LINK_FLAGS COMPILE_FLAGS)
+	foreach(prop LINK_FLAGS)
 		if(${prop})
 			px4_join(OUT ${prop} LIST ${${prop}} GLUE " ")
 		endif()
@@ -259,7 +256,7 @@ function(px4_add_module)
 	if(COMPILE_FLAGS AND ${_no_optimization_for_target})
 		px4_strip_optimization(COMPILE_FLAGS ${COMPILE_FLAGS})
 	endif()
-	foreach (prop COMPILE_FLAGS LINK_FLAGS STACK_MAIN MAIN PRIORITY)
+	foreach (prop LINK_FLAGS STACK_MAIN MAIN PRIORITY)
 		if (${prop})
 			set_target_properties(${MODULE} PROPERTIES ${prop} ${${prop}})
 		endif()