Yet another attempt to enforce using PX4’s mavlink in sitl_gazebo

This commit is contained in:
Oleg Kalachev
2021-06-23 09:04:48 +03:00
parent 93af5e2700
commit 6efa9c89d7

View File

@@ -1,21 +1,16 @@
diff --git a/cmake/FindMAVLink.cmake b/cmake/FindMAVLink.cmake
index 8de3079..c203237 100644
index 8de3079..3fdae02 100644
--- a/cmake/FindMAVLink.cmake
+++ b/cmake/FindMAVLink.cmake
@@ -46,13 +46,6 @@ find_path(_MAVLINK_INCLUDE_DIR
NO_CMAKE_SYSTEM_PATH
@@ -19,6 +19,7 @@ set(_MAVLINK_EXTRA_SEARCH_HINTS
${CMAKE_SOURCE_DIR}/mavlink/
../../mavlink/
../mavlink/
+ $ENV{HOME}/Firmware/mavlink/include
${CATKIN_DEVEL_PREFIX}/
)
-# look specifically for the ROS version if no other was found
-find_path(_MAVLINK_INCLUDE_DIR
- NAMES mavlink/v1.0/mavlink_types.h mavlink/v2.0/mavlink_types.h
- PATH_SUFFIXES include
- PATHS /opt/ros/${ROS_DISTRO}/
- )
-
# read the version
if (EXISTS ${_MAVLINK_INCLUDE_DIR}/mavlink/config.h)
file(READ ${_MAVLINK_INCLUDE_DIR}/mavlink/config.h MAVLINK_CONFIG_FILE)
diff --git a/package.xml b/package.xml
index ae0fb34..12f17b8 100644
--- a/package.xml