Merge pull request #812 from mavlink/fix-mavlink-warning

mavlink_passthrough: re-use mavlink_include.h
mavlink · Jul 25, 2019 · f4065b3 · f4065b3
2 parents 2436f8b + 4ef703b
commit f4065b3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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"
diff --git 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
@@ -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 {