bebop move flow driver to board directory

boards/parrot/bebop/CMakeLists.txt

@@ -0,0 +1,34 @@
+############################################################################
+#
+#   Copyright (c) 2018 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.
+#
+############################################################################
+
+add_subdirectory(flow)

boards/parrot/bebop/default.cmake

@@ -17,7 +17,7 @@ px4_add_board(
 		ak8963
 		bebop_bus
 		bebop_rangefinder
-		#bebop_flow
+		mt9v117
 
 	MODULES
 		attitude_estimator_q

boards/parrot/bebop/flow/CMakeLists.txt

@@ -31,11 +31,11 @@
 #
 ############################################################################
 
-include_directories(../../../../lib/DriverFramework/drivers)
-
 px4_add_module(
-	MODULE platforms__posix__drivers__bebop_flow
+	MODULE drivers__bebop_flow
 	MAIN bebop_flow
+	INCLUDES
+		${PX4_SOURCE_DIR}/src/lib/DriverFramework/drivers
 	SRCS
 		bebop_flow.cpp
 		video_device.cpp

cmake/px4_add_board.cmake

@@ -260,7 +260,10 @@ function(px4_add_board)
 		set(config_df_driver_list)
 		foreach(driver ${DF_DRIVERS})
 			list(APPEND config_df_driver_list ${driver})
+
+			if(EXISTS "${PX4_SOUCE_DIR}/platforms/posix/drivers/df_${driver}_wrapper")
 				list(APPEND config_module_list platforms/posix/drivers/df_${driver}_wrapper)
+			endif()
 		endforeach()
 		set(config_df_driver_list ${config_df_driver_list} PARENT_SCOPE)
 	endif()

platforms/posix/CMakeLists.txt

@@ -62,8 +62,8 @@ else()
 	target_link_libraries(px4
 		PRIVATE
 			${module_libraries}
-			df_driver_framework
 			${df_driver_libs}
+			df_driver_framework
 			pthread m
 	)