From f241518d0e00dc0ad162810dc3b8c7cdb3caebd5 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Thu, 14 Jul 2016 13:46:15 +0200
Subject: [PATCH] RPi2: bring default and release cmake in sync

The two cmake files for default and release where out of
sync. This change bases them on a common cmake file.
---
 cmake/configs/posix_rpi2_common.cmake  | 112 +++++++++++++++++++++++++
 cmake/configs/posix_rpi2_default.cmake |  49 +----------
 cmake/configs/posix_rpi2_release.cmake | 105 +----------------------
 3 files changed, 114 insertions(+), 152 deletions(-)
 create mode 100644 cmake/configs/posix_rpi2_common.cmake

diff --git a/cmake/configs/posix_rpi2_common.cmake b/cmake/configs/posix_rpi2_common.cmake
new file mode 100644
index 0000000000..95477cd8c0
--- /dev/null
+++ b/cmake/configs/posix_rpi2_common.cmake
@@ -0,0 +1,112 @@
+# This file is shared between posix_rpi2_default.cmake
+# and posix_rpi2_release.cmake.
+
+include(posix/px4_impl_posix)
+
+# This definition allows to differentiate if this just the usual POSIX build
+# or if it is for the RPi.
+add_definitions(
+	-D__PX4_POSIX_RPI2
+	-D__LINUX
+)
+
+
+set(config_module_list
+	#
+	# Board support modules
+	#
+	drivers/device
+	modules/sensors
+	platforms/posix/drivers/df_mpu9250_wrapper
+	platforms/posix/drivers/df_lsm9ds1_wrapper
+	platforms/posix/drivers/df_ms5611_wrapper
+	platforms/posix/drivers/df_hmc5883_wrapper
+	platforms/posix/drivers/df_trone_wrapper
+	platforms/posix/drivers/df_isl29501_wrapper
+
+	#
+	# System commands
+	#
+	systemcmds/param
+	systemcmds/mixer
+	systemcmds/ver
+	systemcmds/esc_calib
+	systemcmds/reboot
+	systemcmds/topic_listener
+	systemcmds/perf
+
+	#
+	# Estimation modules (EKF/ SO3 / other filters)
+	#
+	#modules/attitude_estimator_ekf
+	modules/ekf_att_pos_estimator
+	modules/attitude_estimator_q
+	modules/position_estimator_inav
+	modules/local_position_estimator
+	modules/ekf2
+
+	#
+	# Vehicle Control
+	#
+	modules/mc_att_control
+	modules/mc_pos_control
+	modules/fw_att_control
+	modules/fw_pos_control_l1
+	modules/vtol_att_control
+
+	#
+	# Library modules
+	#
+	modules/sdlog2
+	modules/logger
+	modules/commander
+	modules/load_mon
+	modules/param
+	modules/systemlib
+	modules/systemlib/mixer
+	modules/uORB
+	modules/dataman
+	modules/land_detector
+	modules/navigator
+	modules/mavlink
+
+	#
+	# PX4 drivers
+	#
+
+	#
+	# Libraries
+	#
+	lib/controllib
+	lib/mathlib
+	lib/mathlib/math/filter
+	lib/geo
+	lib/ecl
+	lib/geo_lookup
+	lib/launchdetection
+	lib/external_lgpl
+	lib/conversion
+	lib/terrain_estimation
+	lib/runway_takeoff
+	lib/tailsitter_recovery
+	lib/DriverFramework/framework
+
+	#
+	# POSIX
+	#
+	platforms/common
+	platforms/posix/px4_layer
+	platforms/posix/work_queue
+)
+
+#
+# DriverFramework driver
+#
+set(config_df_driver_list
+	mpu9250
+	lsm9ds1
+	ms5611
+	hmc5883
+	trone
+	isl29501
+)
diff --git a/cmake/configs/posix_rpi2_default.cmake b/cmake/configs/posix_rpi2_default.cmake
index ca677261be..9b0f45c718 100644
--- a/cmake/configs/posix_rpi2_default.cmake
+++ b/cmake/configs/posix_rpi2_default.cmake
@@ -1,50 +1,3 @@
-include(posix/px4_impl_posix)
+include(configs/posix_rpi2_common)
 
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cmake)
-
-set(config_module_list
-	drivers/device
-	platforms/common
-	platforms/posix/px4_layer
-	platforms/posix/work_queue
-	systemcmds/param
-	systemcmds/mixer
-	systemcmds/ver
-	systemcmds/esc_calib
-	systemcmds/reboot
-	systemcmds/topic_listener
-	systemcmds/perf
-	modules/uORB
-	modules/param
-	modules/systemlib
-	modules/systemlib/mixer
-	modules/sensors
-	modules/mavlink
-	modules/attitude_estimator_q
-	modules/position_estimator_inav
-	modules/navigator
-	modules/vtol_att_control
-	modules/mc_pos_control
-	modules/mc_att_control
-	modules/land_detector
-	modules/fw_att_control
-	modules/fw_pos_control_l1
-	modules/dataman
-	modules/sdlog2
-	modules/logger
-	modules/commander
-	modules/load_mon
-	lib/controllib
-	lib/mathlib
-	lib/mathlib/math/filter
-	lib/conversion
-	lib/ecl
-	lib/external_lgpl
-	lib/geo
-	lib/geo_lookup
-	lib/launchdetection
-	lib/terrain_estimation
-	lib/runway_takeoff
-	lib/tailsitter_recovery
-	lib/DriverFramework/framework
-)
diff --git a/cmake/configs/posix_rpi2_release.cmake b/cmake/configs/posix_rpi2_release.cmake
index 0778efa1ff..d17ef5cec3 100644
--- a/cmake/configs/posix_rpi2_release.cmake
+++ b/cmake/configs/posix_rpi2_release.cmake
@@ -1,4 +1,4 @@
-include(posix/px4_impl_posix)
+include(configs/posix_rpi2_common)
 
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake)
 
@@ -6,106 +6,3 @@ set(CMAKE_PROGRAM_PATH
 	"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
 	${CMAKE_PROGRAM_PATH}
 )
-
-# This definition allows to differentiate if this just the usual POSIX build
-# or if it is for the RPi.
-add_definitions(
-	-D__PX4_POSIX_RPI2
-	-D__LINUX
-)
-
-set(config_module_list
-	#
-	# Board support modules
-	#
-	drivers/device
-	modules/sensors
-	platforms/posix/drivers/df_mpu9250_wrapper
-	platforms/posix/drivers/df_lsm9ds1_wrapper
-	platforms/posix/drivers/df_ms5611_wrapper
-	platforms/posix/drivers/df_hmc5883_wrapper
-	platforms/posix/drivers/df_trone_wrapper
-	platforms/posix/drivers/df_isl29501_wrapper
-
-	#
-	# System commands
-	#
-	systemcmds/param
-	systemcmds/mixer
-	systemcmds/ver
-	systemcmds/esc_calib
-	systemcmds/topic_listener
-	systemcmds/perf
-
-	#
-	# Estimation modules (EKF/ SO3 / other filters)
-	#
-	#modules/attitude_estimator_ekf
-	modules/ekf_att_pos_estimator
-	modules/attitude_estimator_q
-	modules/position_estimator_inav
-	modules/local_position_estimator
-	modules/ekf2
-
-	#
-	# Vehicle Control
-	#
-	modules/mc_att_control
-	modules/mc_pos_control
-	modules/fw_att_control
-	modules/fw_pos_control_l1	
-	modules/vtol_att_control
-
-	#
-	# Library modules
-	#
-	modules/sdlog2
-	modules/logger
-	modules/commander
-	modules/load_mon
-	modules/param
-	modules/systemlib
-	modules/systemlib/mixer
-	modules/uORB
-	modules/dataman
-	modules/land_detector
-	modules/navigator
-	modules/mavlink
-
-	#
-	# PX4 drivers
-	#
-
-	#
-	# Libraries
-	#
-	lib/controllib
-	lib/mathlib
-	lib/mathlib/math/filter
-	lib/geo
-	lib/ecl
-	lib/geo_lookup
-	lib/launchdetection
-	lib/external_lgpl
-	lib/conversion
-	lib/terrain_estimation
-	lib/runway_takeoff
-	lib/tailsitter_recovery
-	lib/DriverFramework/framework
-
-	#
-	# POSIX
-	#
-	platforms/common
-	platforms/posix/px4_layer
-	platforms/posix/work_queue
-)
-
-set(config_df_driver_list
-	mpu9250
-	lsm9ds1
-	ms5611
-	hmc5883
-	trone
-	isl29501
-)
-- 
GitLab