From 3f8dab4dfcf519d82accac672bcb4a88c78b9c21 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Wed, 8 Feb 2023 09:19:00 +1300
Subject: [PATCH] core/plugins: fix install includes

Signed-off-by: Julian Oes <julian@oes.ch>
---
 src/mavsdk/core/CMakeLists.txt                                 | 1 +
 src/mavsdk/plugins/action/CMakeLists.txt                       | 2 +-
 src/mavsdk/plugins/action_server/CMakeLists.txt                | 2 +-
 src/mavsdk/plugins/calibration/CMakeLists.txt                  | 2 +-
 src/mavsdk/plugins/camera/CMakeLists.txt                       | 2 +-
 src/mavsdk/plugins/camera_server/CMakeLists.txt                | 2 +-
 src/mavsdk/plugins/component_information/CMakeLists.txt        | 2 +-
 src/mavsdk/plugins/component_information_server/CMakeLists.txt | 2 +-
 src/mavsdk/plugins/failure/CMakeLists.txt                      | 2 +-
 src/mavsdk/plugins/follow_me/CMakeLists.txt                    | 2 +-
 src/mavsdk/plugins/ftp/CMakeLists.txt                          | 2 +-
 src/mavsdk/plugins/geofence/CMakeLists.txt                     | 2 +-
 src/mavsdk/plugins/gimbal/CMakeLists.txt                       | 2 +-
 src/mavsdk/plugins/info/CMakeLists.txt                         | 2 +-
 src/mavsdk/plugins/log_files/CMakeLists.txt                    | 2 +-
 src/mavsdk/plugins/manual_control/CMakeLists.txt               | 2 +-
 src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt          | 2 +-
 src/mavsdk/plugins/mission/CMakeLists.txt                      | 2 +-
 src/mavsdk/plugins/mission_raw/CMakeLists.txt                  | 2 +-
 src/mavsdk/plugins/mission_raw_server/CMakeLists.txt           | 2 +-
 src/mavsdk/plugins/mocap/CMakeLists.txt                        | 2 +-
 src/mavsdk/plugins/offboard/CMakeLists.txt                     | 2 +-
 src/mavsdk/plugins/param/CMakeLists.txt                        | 2 +-
 src/mavsdk/plugins/param_server/CMakeLists.txt                 | 2 +-
 src/mavsdk/plugins/rtk/CMakeLists.txt                          | 2 +-
 src/mavsdk/plugins/server_utility/CMakeLists.txt               | 2 +-
 src/mavsdk/plugins/shell/CMakeLists.txt                        | 2 +-
 src/mavsdk/plugins/telemetry/CMakeLists.txt                    | 2 +-
 src/mavsdk/plugins/telemetry_server/CMakeLists.txt             | 2 +-
 src/mavsdk/plugins/tracking_server/CMakeLists.txt              | 2 +-
 src/mavsdk/plugins/transponder/CMakeLists.txt                  | 2 +-
 src/mavsdk/plugins/tune/CMakeLists.txt                         | 2 +-
 src/mavsdk/plugins/winch/CMakeLists.txt                        | 2 +-
 33 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/mavsdk/core/CMakeLists.txt b/src/mavsdk/core/CMakeLists.txt
index a9a77ad45a..248a615369 100644
--- a/src/mavsdk/core/CMakeLists.txt
+++ b/src/mavsdk/core/CMakeLists.txt
@@ -93,6 +93,7 @@ target_include_directories(mavsdk
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mavsdk>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/mavsdk>
+    $<INSTALL_INTERFACE:include>
     PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
diff --git a/src/mavsdk/plugins/action/CMakeLists.txt b/src/mavsdk/plugins/action/CMakeLists.txt
index 5862434fe8..693f27fbb0 100644
--- a/src/mavsdk/plugins/action/CMakeLists.txt
+++ b/src/mavsdk/plugins/action/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/action_server/CMakeLists.txt b/src/mavsdk/plugins/action_server/CMakeLists.txt
index 9f1f5ae199..698a1ae0fb 100644
--- a/src/mavsdk/plugins/action_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/action_server/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/calibration/CMakeLists.txt b/src/mavsdk/plugins/calibration/CMakeLists.txt
index 6b59243f41..6dbaed37ae 100644
--- a/src/mavsdk/plugins/calibration/CMakeLists.txt
+++ b/src/mavsdk/plugins/calibration/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/camera/CMakeLists.txt b/src/mavsdk/plugins/camera/CMakeLists.txt
index b1989bcce3..5ddce2071d 100644
--- a/src/mavsdk/plugins/camera/CMakeLists.txt
+++ b/src/mavsdk/plugins/camera/CMakeLists.txt
@@ -11,7 +11,7 @@ target_include_directories(mavsdk
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/camera_definition_files/generated>
     PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/camera_server/CMakeLists.txt b/src/mavsdk/plugins/camera_server/CMakeLists.txt
index b51696f024..e3244ebb1a 100644
--- a/src/mavsdk/plugins/camera_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/camera_server/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/camera_server/camera_server.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/camera_server
-)
\ No newline at end of file
+)
diff --git a/src/mavsdk/plugins/component_information/CMakeLists.txt b/src/mavsdk/plugins/component_information/CMakeLists.txt
index 9a9c6856e9..93f76f067e 100644
--- a/src/mavsdk/plugins/component_information/CMakeLists.txt
+++ b/src/mavsdk/plugins/component_information/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/component_information/component_information.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/component_information
-)
\ No newline at end of file
+)
diff --git a/src/mavsdk/plugins/component_information_server/CMakeLists.txt b/src/mavsdk/plugins/component_information_server/CMakeLists.txt
index 7ca53752eb..dd59e6951c 100644
--- a/src/mavsdk/plugins/component_information_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/component_information_server/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/component_information_server/component_information_server.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/component_information_server
-)
\ No newline at end of file
+)
diff --git a/src/mavsdk/plugins/failure/CMakeLists.txt b/src/mavsdk/plugins/failure/CMakeLists.txt
index 9daea70b36..3497b2c747 100644
--- a/src/mavsdk/plugins/failure/CMakeLists.txt
+++ b/src/mavsdk/plugins/failure/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/follow_me/CMakeLists.txt b/src/mavsdk/plugins/follow_me/CMakeLists.txt
index f71ba14485..1039dc4121 100644
--- a/src/mavsdk/plugins/follow_me/CMakeLists.txt
+++ b/src/mavsdk/plugins/follow_me/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/ftp/CMakeLists.txt b/src/mavsdk/plugins/ftp/CMakeLists.txt
index 2150ebd10f..80dcbe93cc 100644
--- a/src/mavsdk/plugins/ftp/CMakeLists.txt
+++ b/src/mavsdk/plugins/ftp/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/geofence/CMakeLists.txt b/src/mavsdk/plugins/geofence/CMakeLists.txt
index 60b952913e..c4677672f0 100644
--- a/src/mavsdk/plugins/geofence/CMakeLists.txt
+++ b/src/mavsdk/plugins/geofence/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/gimbal/CMakeLists.txt b/src/mavsdk/plugins/gimbal/CMakeLists.txt
index 7f556d7bdc..af37cae51b 100644
--- a/src/mavsdk/plugins/gimbal/CMakeLists.txt
+++ b/src/mavsdk/plugins/gimbal/CMakeLists.txt
@@ -8,7 +8,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/info/CMakeLists.txt b/src/mavsdk/plugins/info/CMakeLists.txt
index dabc3e45ae..a149523213 100644
--- a/src/mavsdk/plugins/info/CMakeLists.txt
+++ b/src/mavsdk/plugins/info/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/log_files/CMakeLists.txt b/src/mavsdk/plugins/log_files/CMakeLists.txt
index ba1a07eee0..0b20dcfa0d 100644
--- a/src/mavsdk/plugins/log_files/CMakeLists.txt
+++ b/src/mavsdk/plugins/log_files/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/manual_control/CMakeLists.txt b/src/mavsdk/plugins/manual_control/CMakeLists.txt
index d5414e74d7..e800a5d69e 100644
--- a/src/mavsdk/plugins/manual_control/CMakeLists.txt
+++ b/src/mavsdk/plugins/manual_control/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt b/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt
index d0d2620915..0fa6cf3010 100644
--- a/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt
+++ b/src/mavsdk/plugins/mavlink_passthrough/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/mission/CMakeLists.txt b/src/mavsdk/plugins/mission/CMakeLists.txt
index 8f913e953f..b54d31617a 100644
--- a/src/mavsdk/plugins/mission/CMakeLists.txt
+++ b/src/mavsdk/plugins/mission/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/mission_raw/CMakeLists.txt b/src/mavsdk/plugins/mission_raw/CMakeLists.txt
index 103288c639..ce7088b858 100644
--- a/src/mavsdk/plugins/mission_raw/CMakeLists.txt
+++ b/src/mavsdk/plugins/mission_raw/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/mission_raw_server/CMakeLists.txt b/src/mavsdk/plugins/mission_raw_server/CMakeLists.txt
index fde31ab08d..52479b9146 100644
--- a/src/mavsdk/plugins/mission_raw_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/mission_raw_server/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/mission_raw_server/mission_raw_server.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/mission_raw_server
-)
\ No newline at end of file
+)
diff --git a/src/mavsdk/plugins/mocap/CMakeLists.txt b/src/mavsdk/plugins/mocap/CMakeLists.txt
index 56eed0b62e..f954f936ba 100644
--- a/src/mavsdk/plugins/mocap/CMakeLists.txt
+++ b/src/mavsdk/plugins/mocap/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/offboard/CMakeLists.txt b/src/mavsdk/plugins/offboard/CMakeLists.txt
index d7793cc5c4..4fbbd75d5d 100644
--- a/src/mavsdk/plugins/offboard/CMakeLists.txt
+++ b/src/mavsdk/plugins/offboard/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/param/CMakeLists.txt b/src/mavsdk/plugins/param/CMakeLists.txt
index 0e1501a9ac..a8656f2b43 100644
--- a/src/mavsdk/plugins/param/CMakeLists.txt
+++ b/src/mavsdk/plugins/param/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/param_server/CMakeLists.txt b/src/mavsdk/plugins/param_server/CMakeLists.txt
index 3464d2b1e7..5a34c7e36b 100644
--- a/src/mavsdk/plugins/param_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/param_server/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/rtk/CMakeLists.txt b/src/mavsdk/plugins/rtk/CMakeLists.txt
index f2521a13a5..665d16fe7d 100644
--- a/src/mavsdk/plugins/rtk/CMakeLists.txt
+++ b/src/mavsdk/plugins/rtk/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/rtk/rtk.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/rtk
-)
\ No newline at end of file
+)
diff --git a/src/mavsdk/plugins/server_utility/CMakeLists.txt b/src/mavsdk/plugins/server_utility/CMakeLists.txt
index 1ce601f7fa..dcdd50760e 100644
--- a/src/mavsdk/plugins/server_utility/CMakeLists.txt
+++ b/src/mavsdk/plugins/server_utility/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/shell/CMakeLists.txt b/src/mavsdk/plugins/shell/CMakeLists.txt
index 4d9a6e7173..7249941e70 100644
--- a/src/mavsdk/plugins/shell/CMakeLists.txt
+++ b/src/mavsdk/plugins/shell/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/telemetry/CMakeLists.txt b/src/mavsdk/plugins/telemetry/CMakeLists.txt
index efeb4d634b..65286f9848 100644
--- a/src/mavsdk/plugins/telemetry/CMakeLists.txt
+++ b/src/mavsdk/plugins/telemetry/CMakeLists.txt
@@ -7,7 +7,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/telemetry_server/CMakeLists.txt b/src/mavsdk/plugins/telemetry_server/CMakeLists.txt
index 52fb32f41b..f539e3519f 100644
--- a/src/mavsdk/plugins/telemetry_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/telemetry_server/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/tracking_server/CMakeLists.txt b/src/mavsdk/plugins/tracking_server/CMakeLists.txt
index fdf59bdd95..e8a3b042aa 100644
--- a/src/mavsdk/plugins/tracking_server/CMakeLists.txt
+++ b/src/mavsdk/plugins/tracking_server/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/transponder/CMakeLists.txt b/src/mavsdk/plugins/transponder/CMakeLists.txt
index 1164ad87c1..e91a8f1e73 100644
--- a/src/mavsdk/plugins/transponder/CMakeLists.txt
+++ b/src/mavsdk/plugins/transponder/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/tune/CMakeLists.txt b/src/mavsdk/plugins/tune/CMakeLists.txt
index 19b54d8f49..6f5c6e61f7 100644
--- a/src/mavsdk/plugins/tune/CMakeLists.txt
+++ b/src/mavsdk/plugins/tune/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(mavsdk
 
 target_include_directories(mavsdk PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:include/mavsdk>
     )
 
 install(FILES
diff --git a/src/mavsdk/plugins/winch/CMakeLists.txt b/src/mavsdk/plugins/winch/CMakeLists.txt
index ed0942c603..136f1a32a3 100644
--- a/src/mavsdk/plugins/winch/CMakeLists.txt
+++ b/src/mavsdk/plugins/winch/CMakeLists.txt
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/winch/winch.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/winch
-)
\ No newline at end of file
+)