From 4beabff26bfbdfe6253cf5ea44fea8788c310cf7 Mon Sep 17 00:00:00 2001
From: Mark Charlebois <charlebm@gmail.com>
Date: Thu, 10 Sep 2015 19:38:22 -0700
Subject: [PATCH] cmake: fixed posix configs

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
---
 cmake/configs/config_posix_eagle_default.cmake | 5 +++--
 cmake/configs/config_posix_eagle_hil.cmake     | 5 +++--
 cmake/configs/config_posix_eagle_muorb.cmake   | 5 +++--
 cmake/configs/config_posix_eagle_release.cmake | 4 ++--
 cmake/configs/config_posix_sitl_simple.cmake   | 1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cmake/configs/config_posix_eagle_default.cmake b/cmake/configs/config_posix_eagle_default.cmake
index 04f80c7523..ddbf058bc7 100644
--- a/cmake/configs/config_posix_eagle_default.cmake
+++ b/cmake/configs/config_posix_eagle_default.cmake
@@ -4,7 +4,8 @@ function(px4_get_config)
 
 	px4_parse_function_args(
 		NAME px4_set_config_modules
-		ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
+		ONE_VALUE OUT_MODULES
+		REQUIRED OUT_MODULES
 		ARGN ${ARGN})
 
 	set(config_module_list
@@ -47,7 +48,7 @@ function(px4_get_config)
 		platforms/posix/work_queue
 		)
 
-	set(${out_module_list} ${config_module_list} PARENT_SCOPE)
+	set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
 
 endfunction()
 
diff --git a/cmake/configs/config_posix_eagle_hil.cmake b/cmake/configs/config_posix_eagle_hil.cmake
index 115f70d406..be779e143f 100644
--- a/cmake/configs/config_posix_eagle_hil.cmake
+++ b/cmake/configs/config_posix_eagle_hil.cmake
@@ -4,7 +4,8 @@ function(px4_get_config)
 
 	px4_parse_function_args(
 		NAME px4_set_config_modules
-		ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
+		ONE_VALUE OUT_MODULES
+		REQUIRED OUT_MODULES
 		ARGN ${ARGN})
 
 	set(config_module_list
@@ -36,7 +37,7 @@ function(px4_get_config)
 		modules/muorb/krait
 		)
 
-	set(${out_module_list} ${config_module_list} PARENT_SCOPE)
+	set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
 
 endfunction()
 
diff --git a/cmake/configs/config_posix_eagle_muorb.cmake b/cmake/configs/config_posix_eagle_muorb.cmake
index 44fe4cebe0..c08e43861d 100644
--- a/cmake/configs/config_posix_eagle_muorb.cmake
+++ b/cmake/configs/config_posix_eagle_muorb.cmake
@@ -4,7 +4,8 @@ function(px4_get_config)
 
 	px4_parse_function_args(
 		NAME px4_set_config_modules
-		ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
+		ONE_VALUE OUT_MODULES
+		REQUIRED OUT_MODULES
 		ARGN ${ARGN})
 
 	set(config_module_list
@@ -18,7 +19,7 @@ function(px4_get_config)
 		modules/muorb/krait
 		)
 
-	set(${out_module_list} ${config_module_list} PARENT_SCOPE)
+	set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
 
 endfunction()
 
diff --git a/cmake/configs/config_posix_eagle_release.cmake b/cmake/configs/config_posix_eagle_release.cmake
index 90c81fd411..90d2e40b86 100644
--- a/cmake/configs/config_posix_eagle_release.cmake
+++ b/cmake/configs/config_posix_eagle_release.cmake
@@ -4,7 +4,7 @@ function(px4_get_config)
 
 	px4_parse_function_args(
 		NAME px4_set_config_modules
-		ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
+		ONE_VALUE OUT_MODULES
 		ARGN ${ARGN})
 
 	set(config_module_list
@@ -31,7 +31,7 @@ function(px4_get_config)
 		modules/muorb/krait
 		)
 
-	set(${out_module_list} ${config_module_list} PARENT_SCOPE)
+	set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
 
 endfunction()
 
diff --git a/cmake/configs/config_posix_sitl_simple.cmake b/cmake/configs/config_posix_sitl_simple.cmake
index 20481bdb1e..39aed67046 100644
--- a/cmake/configs/config_posix_sitl_simple.cmake
+++ b/cmake/configs/config_posix_sitl_simple.cmake
@@ -1,4 +1,5 @@
 include(posix/px4_impl_posix)
+set(USE_TOOLCHAIN Toolchain-native)
 
 function(px4_get_config)