From e5ce9809c5834f668ace0aae5058a68a41b07528 Mon Sep 17 00:00:00 2001
From: Jonathan Challinger <mr.challinger@gmail.com>
Date: Sun, 28 Feb 2016 22:54:31 -0800
Subject: [PATCH] cmake: add load_mon wherever commander is built
---
cmake/configs/nuttx_px4fmu-v1_default.cmake | 1 +
cmake/configs/nuttx_px4fmu-v2_default.cmake | 1 +
cmake/configs/nuttx_px4fmu-v2_ekf2.cmake | 1 +
cmake/configs/nuttx_px4fmu-v4_default.cmake | 1 +
cmake/configs/posix_eagle_hil.cmake | 1 +
cmake/configs/posix_rpi2_default.cmake | 1 +
cmake/configs/posix_rpi2_release.cmake | 3 ++-
cmake/configs/posix_sdflight_default.cmake | 1 +
cmake/configs/posix_sitl_default.cmake | 1 +
cmake/configs/posix_sitl_ekf2.cmake | 1 +
cmake/configs/qurt_eagle_hil.cmake | 1 +
cmake/configs/qurt_eagle_legacy_driver_default.cmake | 1 +
cmake/configs/qurt_eagle_travis.cmake | 1 +
cmake/configs/qurt_sdflight_default.cmake | 1 +
14 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/cmake/configs/nuttx_px4fmu-v1_default.cmake b/cmake/configs/nuttx_px4fmu-v1_default.cmake
index 85c7e2f347..dfb672a5a8 100644
--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@@ -61,6 +61,7 @@ set(config_module_list
# General system control
#
modules/commander
+ modules/load_mon
modules/navigator
modules/mavlink
modules/gpio_led
diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake
index 97f9126004..a30cd9b381 100644
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -72,6 +72,7 @@ set(config_module_list
# General system control
#
modules/commander
+ modules/load_mon
modules/navigator
modules/mavlink
modules/gpio_led
diff --git a/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake b/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
index 6cc8c2d262..33daab5f77 100644
--- a/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_ekf2.cmake
@@ -69,6 +69,7 @@ set(config_module_list
# General system control
#
modules/commander
+ modules/load_mon
modules/navigator
modules/mavlink
modules/gpio_led
diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake
index f060be5050..7c54edf15c 100644
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -70,6 +70,7 @@ set(config_module_list
# General system control
#
modules/commander
+ modules/load_mon
modules/navigator
modules/mavlink
modules/gpio_led
diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake
index 252de9718c..3e6274956f 100644
--- a/cmake/configs/posix_eagle_hil.cmake
+++ b/cmake/configs/posix_eagle_hil.cmake
@@ -29,6 +29,7 @@ set(config_module_list
modules/sdlog2
modules/simulator
modules/commander
+ modules/load_mon
lib/mathlib
lib/mathlib/math/filter
diff --git a/cmake/configs/posix_rpi2_default.cmake b/cmake/configs/posix_rpi2_default.cmake
index 071466b224..c67d241f9f 100644
--- a/cmake/configs/posix_rpi2_default.cmake
+++ b/cmake/configs/posix_rpi2_default.cmake
@@ -32,6 +32,7 @@ set(config_module_list
modules/dataman
modules/sdlog2
modules/commander
+ modules/load_mon
lib/controllib
lib/mathlib
lib/mathlib/math/filter
diff --git a/cmake/configs/posix_rpi2_release.cmake b/cmake/configs/posix_rpi2_release.cmake
index e42a1b8fd3..e4272e6ef4 100644
--- a/cmake/configs/posix_rpi2_release.cmake
+++ b/cmake/configs/posix_rpi2_release.cmake
@@ -4,7 +4,7 @@ if ("${RPI_TOOLCHAIN_DIR}" STREQUAL "")
set(RPI_TOOLCHAIN_DIR /opt/rpi_toolchain)
endif()
-set(CMAKE_PROGRAM_PATH
+set(CMAKE_PROGRAM_PATH
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
${CMAKE_PROGRAM_PATH}
)
@@ -41,6 +41,7 @@ set(config_module_list
modules/dataman
modules/sdlog2
modules/commander
+ modules/load_mon
lib/controllib
lib/mathlib
lib/mathlib/math/filter
diff --git a/cmake/configs/posix_sdflight_default.cmake b/cmake/configs/posix_sdflight_default.cmake
index da51797a59..5d026346c7 100644
--- a/cmake/configs/posix_sdflight_default.cmake
+++ b/cmake/configs/posix_sdflight_default.cmake
@@ -40,6 +40,7 @@ set(config_module_list
modules/sdlog2
modules/simulator
modules/commander
+ modules/load_mon
lib/controllib
lib/mathlib
diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake
index 11a211b9c0..a42385cd9d 100644
--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@@ -51,6 +51,7 @@ set(config_module_list
modules/dataman
modules/sdlog2
modules/commander
+ modules/load_mon
lib/controllib
lib/mathlib
lib/mathlib/math/filter
diff --git a/cmake/configs/posix_sitl_ekf2.cmake b/cmake/configs/posix_sitl_ekf2.cmake
index 5cb53b3c22..7da1e16d4a 100644
--- a/cmake/configs/posix_sitl_ekf2.cmake
+++ b/cmake/configs/posix_sitl_ekf2.cmake
@@ -49,6 +49,7 @@ set(config_module_list
modules/dataman
modules/sdlog2
modules/commander
+ modules/load_mon
lib/controllib
lib/mathlib
lib/mathlib/math/filter
diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake
index 469432818f..f2a77068e4 100644
--- a/cmake/configs/qurt_eagle_hil.cmake
+++ b/cmake/configs/qurt_eagle_hil.cmake
@@ -48,6 +48,7 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
modules/commander
+ modules/load_mon
#
# Libraries
diff --git a/cmake/configs/qurt_eagle_legacy_driver_default.cmake b/cmake/configs/qurt_eagle_legacy_driver_default.cmake
index 223f3b8a4f..1ff1845c32 100644
--- a/cmake/configs/qurt_eagle_legacy_driver_default.cmake
+++ b/cmake/configs/qurt_eagle_legacy_driver_default.cmake
@@ -58,6 +58,7 @@ set(config_module_list
modules/uORB
modules/commander
modules/land_detector
+ modules/load_mon
#
# PX4 drivers
diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake
index 01b87f6bb2..eee24eda15 100644
--- a/cmake/configs/qurt_eagle_travis.cmake
+++ b/cmake/configs/qurt_eagle_travis.cmake
@@ -55,6 +55,7 @@ set(config_module_list
modules/systemlib/mixer
modules/uORB
modules/commander
+ modules/load_mon
#
# Libraries
diff --git a/cmake/configs/qurt_sdflight_default.cmake b/cmake/configs/qurt_sdflight_default.cmake
index 3ea8ad37b4..c646a6dfb6 100644
--- a/cmake/configs/qurt_sdflight_default.cmake
+++ b/cmake/configs/qurt_sdflight_default.cmake
@@ -55,6 +55,7 @@ set(config_module_list
modules/uORB
modules/commander
modules/land_detector
+ modules/load_mon
#
# PX4 drivers
--
GitLab