Merge pull request #1943 from mavlink/v1.4-proto-submodule

[v1.4] proto submodule update
mavlink · Jan 13, 2023 · 301a7d7 · 301a7d7
2 parents 163601d + e64b53c
commit 301a7d7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -252,6 +252,8 @@ jobs:
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git config --global --add safe.directory /github/workspace
+      - name: install pymavlink dependencies
+        run: python3 -m pip install future
       - name: configure
         run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MAVSDK_SERVER=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=install -DWERROR=OFF  -Bbuild/release -H.
       - name: build

diff --git a/proto b/proto
diff --git a/src/mavsdk/core/include/mavsdk/system.h b/src/mavsdk/core/include/mavsdk/system.h
@@ -3,6 +3,7 @@
 #include <memory>
 #include <array>
 #include <functional>
+#include <string>
 #include <vector>
 
 #include "deprecated.h"

diff --git a/third_party/mavlink/CMakeLists.txt b/third_party/mavlink/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND CMAKE_ARGS
 
 # Without this GitHub actions picks the wrong python3 executable.
 set(Python3_FIND_REGISTRY "NEVER")
+set(Python3_FIND_FRAMEWORK "NEVER")
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
 ExternalProject_add(