diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3916c8f1ff..2ad3c7ff4e 100644 --- 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 index 743aa1d240..17d707685a 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 743aa1d24094db30ac3ed503d9552fb9c49ef4c4 +Subproject commit 17d707685a8cbe5e0b6c930850b5a2c75b85bbd8 diff --git a/src/mavsdk/core/include/mavsdk/system.h b/src/mavsdk/core/include/mavsdk/system.h index bff6c249d6..c11f5df3dd 100644 --- a/src/mavsdk/core/include/mavsdk/system.h +++ b/src/mavsdk/core/include/mavsdk/system.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "deprecated.h" diff --git a/third_party/mavlink/CMakeLists.txt b/third_party/mavlink/CMakeLists.txt index 132aa3866d..18759d7137 100644 --- 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(