Merge pull request #1982 from mavlink/pr-fix-includes

core/plugins: fix includes
mavlink · Feb 7, 2023 · 023250b · 023250b
2 parents 7708d66 + 3f8dab4
commit 023250b
Show file tree

Hide file tree

Showing 33 changed files with 33 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-)
+)
diff --git 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
-)
+)
diff --git 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
-)
+)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-)
+)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/rtk/rtk.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/rtk
-)
+)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,4 +12,4 @@ target_include_directories(mavsdk PUBLIC
 install(FILES
     include/plugins/winch/winch.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mavsdk/plugins/winch
-)
+)