From b8f76bfeaa1b23dac2e70f1073b92935543d2d43 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Tue, 23 Jul 2019 09:59:31 +0200
Subject: [PATCH 1/2] mavlink_passthrough: re-use mavlink_include.h

The mavlink_include.h file contains a pragma to ignore warnings which is
helpful when the MAVLink include is used by library users through the
mavlink_passthrough plugin.
---
 src/plugins/mavlink_passthrough/CMakeLists.txt                  | 1 +
 .../include/plugins/mavlink_passthrough/mavlink_passthrough.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/mavlink_passthrough/CMakeLists.txt b/src/plugins/mavlink_passthrough/CMakeLists.txt
index d0a4740cbe..76e941da7c 100644
--- a/src/plugins/mavlink_passthrough/CMakeLists.txt
+++ b/src/plugins/mavlink_passthrough/CMakeLists.txt
@@ -24,6 +24,7 @@ install(TARGETS mavsdk_mavlink_passthrough
 
 install(FILES
     include/plugins/mavlink_passthrough/mavlink_passthrough.h
+    ../../core/mavlink_include.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mavlink_passthrough
 )
 
diff --git a/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h b/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h
index 7405a07d49..5522ece7a2 100644
--- a/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h
+++ b/src/plugins/mavlink_passthrough/include/plugins/mavlink_passthrough/mavlink_passthrough.h
@@ -5,7 +5,7 @@
 #include <functional>
 
 // This plugin provides/includes the mavlink 2.0 header files.
-#include "mavlink/v2.0/common/mavlink.h"
+#include "mavlink_include.h"
 #include "plugin_base.h"
 
 namespace mavsdk {

From 4ef703b6db4ff07450558cb793178f2e5e795fdd Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Tue, 23 Jul 2019 11:11:35 +0200
Subject: [PATCH 2/2] core: adapt include for mavlink_passthrough

Without this we had troubles including this on the Windows debug build.
---
 src/core/mavlink_include.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mavlink_include.h b/src/core/mavlink_include.h
index e2e70056d5..93fed8029d 100644
--- a/src/core/mavlink_include.h
+++ b/src/core/mavlink_include.h
@@ -4,4 +4,4 @@
 #pragma GCC system_header
 #endif
 
-#include <mavlink/v2.0/common/mavlink.h>
+#include "mavlink/v2.0/common/mavlink.h"