Merge pull request #1911 from mavlink/pr-backport-v1.4-1819

[Backport v1.4] cmake: install mavlink headers in correct dir
mavlink · Oct 10, 2022 · 534b34b · 534b34b
2 parents bd80ac8 + cf126ad
commit 534b34b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/mavsdk/core/CMakeLists.txt b/src/mavsdk/core/CMakeLists.txt
@@ -113,6 +113,11 @@ install(FILES
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/mavsdk"
 )
 
+install(DIRECTORY
+    ${MAVLINK_HEADERS}/mavlink
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk
+)
+
 list(APPEND UNIT_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavsdk_time_test.cpp
     ${PROJECT_SOURCE_DIR}/mavsdk/core/mavsdk_math_test.cpp

diff --git a/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt b/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt
@@ -15,8 +15,3 @@ install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/../../../mavsdk/core/mavlink_include.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mavlink_passthrough
 )
-
-install(DIRECTORY
-    ${MAVLINK_HEADERS}
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mavlink_passthrough
-)