CMake: Make Test Dependencies Private

mavlink · Feb 9, 2025 · edd417a · edd417a
1 parent 920a02e
commit edd417a
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,6 +12,7 @@ on:
       - '.github/workflows/linux.yml'
       - 'deploy/linux/**'
       - 'src/**'
+      - 'test/**'
       - 'CMakeLists.txt'
 
 # concurrency:

diff --git a/test/AutoPilotPlugins/CMakeLists.txt b/test/AutoPilotPlugins/CMakeLists.txt
@@ -11,11 +11,11 @@ target_link_libraries(AutoPilotPluginsTest
         Qt6::Test
         APMAutoPilotPlugin
         AutoPilotPlugins
+        CommonAutoPilotPlugin
         PX4AutoPilotPlugin
         Vehicle
     PUBLIC
         Qt6::Core
-        CommonAutoPilotPlugin
         qgcunittest
 )
 

diff --git a/test/Geo/CMakeLists.txt b/test/Geo/CMakeLists.txt
@@ -8,10 +8,10 @@ qt_add_library(GeoTest
 
 target_link_libraries(GeoTest
     PRIVATE
+        Qt6::Positioning
         Qt6::Test
         Geo
     PUBLIC
-        Qt6::Positioning
         qgcunittest
 )
 

diff --git a/test/MissionManager/CMakeLists.txt b/test/MissionManager/CMakeLists.txt
@@ -29,18 +29,19 @@ qt_add_library(MissionManagerTest
 
 target_link_libraries(MissionManagerTest
     PRIVATE
+        Qt6::Positioning
         Qt6::Test
         API
+        FactSystem
         FirmwarePlugin
+        MissionManager
+        QmlControls
         Settings
+        TerrainTest
         Utilities
         Vehicle
-        TerrainTest
     PUBLIC
-        Qt6::Positioning
-        MissionManager
         qgcunittest
-        QmlControls
 )
 
 target_include_directories(MissionManagerTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/test/MissionManager/MissionItemTest.cc b/test/MissionManager/MissionItemTest.cc
@@ -11,6 +11,7 @@
 #include "MissionItemTest.h"
 #include "SimpleMissionItem.h"
 #include "PlanMasterController.h"
+#include "MissionItem.h"
 #include "MultiSignalSpy.h"
 
 #include <QtTest/QTest>

diff --git a/test/MissionManager/MissionItemTest.h b/test/MissionManager/MissionItemTest.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "UnitTest.h"
-#include "MissionItem.h"
 
+class MissionItem;
 class PlanMasterController;
 
 /// Unit test for the MissionItem Object

diff --git a/test/Terrain/CMakeLists.txt b/test/Terrain/CMakeLists.txt
@@ -10,11 +10,11 @@ qt_add_library(TerrainTest
 
 target_link_libraries(TerrainTest
     PRIVATE
+        Qt6::Positioning
         Qt6::Test
+        Terrain
     PUBLIC
-        Qt6::Positioning
         qgcunittest
-        Terrain
 )
 
 target_include_directories(TerrainTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/Vehicle/CMakeLists.txt b/test/Vehicle/CMakeLists.txt
@@ -23,12 +23,11 @@ qt_add_library(VehicleTest
 target_link_libraries(VehicleTest
     PRIVATE
         Qt6::Test
-    PUBLIC
         Comms
-        qgcunittest
         Vehicle
-    INTERFACE
         VehicleComponentsTest
+    PUBLIC
+        qgcunittest
 )
 
 target_include_directories(VehicleTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/Vehicle/SendMavCommandWithSignallingTest.h b/test/Vehicle/SendMavCommandWithSignallingTest.h
@@ -12,9 +12,6 @@
 #include "UnitTest.h"
 #include "Vehicle.h"
 
-#include <QtTest/QTest>
-#include <QtTest/QSignalSpy>
-
 class SendMavCommandWithSignallingTest : public UnitTest
 {
     Q_OBJECT