cmake: avoid GLOB for *.msg files and use an explicit .msg file enumeration

This makes sure that adding & removing of .msg files is handled properly
by the build system.

CMakeLists.txt

@@ -295,7 +295,7 @@ add_definitions(${definitions})
 #=============================================================================
 # source code generation
 #
-file(GLOB msg_files msg/*.msg)
+add_subdirectory(msg)
 px4_generate_messages(TARGET msg_gen
 	MSG_FILES ${msg_files}
 	OS ${OS}

Tools/px_generate_uorb_topic_files.py

@@ -198,6 +198,9 @@ def convert_dir(format_idx, inputdir, outputdir, templatedir):
                 if not os.path.isfile(fn):
                         continue
 
+                if fn[-4:].lower() != '.msg':
+                        continue
+
                 generate_output_from_file(format_idx, fn, outputdir, templatedir, includepath)
         return True
 

cmake/common/px4_base.cmake

@@ -415,6 +415,13 @@ function(px4_generate_messages)
 		)
 	set_source_files_properties(${msg_source_files_out} PROPERTIES GENERATED TRUE)
 
+	# We remove uORBTopics.cpp to make sure the generator is re-run, which is
+	# necessary when a .msg file is removed and because uORBTopics.cpp depends
+	# on all topics.
+	execute_process(COMMAND rm uORBTopics.cpp
+		WORKING_DIRECTORY ${msg_source_out_path}
+		ERROR_QUIET)
+
 	# multi messages for target OS
 	set(msg_multi_out_path
 		${CMAKE_BINARY_DIR}/src/platforms/${OS}/px4_messages)

msg/CMakeLists.txt

@@ -0,0 +1,130 @@
+############################################################################
+#
+#   Copyright (c) 2016 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+set(msg_file_names
+	actuator_armed.msg
+	actuator_controls.msg
+	actuator_direct.msg
+	actuator_outputs.msg
+	adc_report.msg
+	airspeed.msg
+	att_pos_mocap.msg
+	battery_status.msg
+	camera_trigger.msg
+	commander_state.msg
+	control_state.msg
+	cpuload.msg
+	debug_key_value.msg
+	differential_pressure.msg
+	distance_sensor.msg
+	ekf2_innovations.msg
+	ekf2_replay.msg
+	encoders.msg
+	esc_report.msg
+	esc_status.msg
+	estimator_status.msg
+	fence.msg
+	fence_vertex.msg
+	filtered_bottom_flow.msg
+	follow_target.msg
+	fw_pos_ctrl_status.msg
+	fw_virtual_attitude_setpoint.msg
+	fw_virtual_rates_setpoint.msg
+	geofence_result.msg
+	gps_inject_data.msg
+	hil_sensor.msg
+	home_position.msg
+	input_rc.msg
+	manual_control_setpoint.msg
+	mavlink_log.msg
+	mc_att_ctrl_status.msg
+	mc_virtual_attitude_setpoint.msg
+	mc_virtual_rates_setpoint.msg
+	mission.msg
+	mission_result.msg
+	multirotor_motor_limits.msg
+	offboard_control_mode.msg
+	optical_flow.msg
+	output_pwm.msg
+	parameter_update.msg
+	position_setpoint.msg
+	position_setpoint_triplet.msg
+	pwm_input.msg
+	qshell_req.msg
+	rc_channels.msg
+	rc_parameter_map.msg
+	safety.msg
+	satellite_info.msg
+	sensor_accel.msg
+	sensor_baro.msg
+	sensor_combined.msg
+	sensor_gyro.msg
+	sensor_mag.msg
+	servorail_status.msg
+	subsystem_info.msg
+	system_power.msg
+	tecs_status.msg
+	telemetry_status.msg
+	test_motor.msg
+	time_offset.msg
+	transponder_report.msg
+	uavcan_parameter_request.msg
+	uavcan_parameter_value.msg
+	vehicle_attitude.msg
+	vehicle_attitude_setpoint.msg
+	vehicle_command_ack.msg
+	vehicle_command.msg
+	vehicle_control_mode.msg
+	vehicle_force_setpoint.msg
+	vehicle_global_position.msg
+	vehicle_global_velocity_setpoint.msg
+	vehicle_gps_position.msg
+	vehicle_land_detected.msg
+	vehicle_local_position.msg
+	vehicle_local_position_setpoint.msg
+	vehicle_rates_setpoint.msg
+	vehicle_status.msg
+	vision_position_estimate.msg
+	vtol_vehicle_status.msg
+	wind_estimate.msg
+	)
+
+# Get absolute paths
+set(msg_files)
+foreach(msg_file ${msg_file_names})
+	list(APPEND msg_files ${CMAKE_CURRENT_SOURCE_DIR}/${msg_file})
+endforeach()
+
+set(msg_files ${msg_files} PARENT_SCOPE)
+
+# vim: set noet ft=cmake fenc=utf-8 ff=unix :