CMake: Make Test Dependencies Private

2025-02-08 23:18:03 -05:00
parent 920a02e14f
commit 60260a52b1
9 changed files with 15 additions and 16 deletions
@@ -12,6 +12,7 @@ on:
      - '.github/workflows/linux.yml'
      - 'deploy/linux/**'
      - 'src/**'
+      - 'test/**'
      - 'CMakeLists.txt'

 # concurrency:
@@ -11,11 +11,11 @@ target_link_libraries(AutoPilotPluginsTest
        Qt6::Test
        APMAutoPilotPlugin
        AutoPilotPlugins
+        CommonAutoPilotPlugin
        PX4AutoPilotPlugin
        Vehicle
    PUBLIC
        Qt6::Core
-        CommonAutoPilotPlugin
        qgcunittest
 )

@@ -8,10 +8,10 @@ qt_add_library(GeoTest

 target_link_libraries(GeoTest
    PRIVATE
+        Qt6::Positioning
        Qt6::Test
        Geo
    PUBLIC
-        Qt6::Positioning
        qgcunittest
 )

@@ -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})
@@ -11,6 +11,7 @@
 #include "MissionItemTest.h"
 #include "SimpleMissionItem.h"
 #include "PlanMasterController.h"
+#include "MissionItem.h"
 #include "MultiSignalSpy.h"

 #include <QtTest/QTest>
@@ -10,8 +10,8 @@
 #pragma once

 #include "UnitTest.h"
-#include "MissionItem.h"

+class MissionItem;
 class PlanMasterController;

 /// Unit test for the MissionItem Object
@@ -10,11 +10,11 @@ qt_add_library(TerrainTest

 target_link_libraries(TerrainTest
    PRIVATE
-        Qt6::Test
-    PUBLIC
        Qt6::Positioning
-        qgcunittest
+        Qt6::Test
        Terrain
+    PUBLIC
+        qgcunittest
 )

 target_include_directories(TerrainTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -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})
@@ -12,9 +12,6 @@
 #include "UnitTest.h"
 #include "Vehicle.h"

-#include <QtTest/QTest>
-#include <QtTest/QSignalSpy>
-
 class SendMavCommandWithSignallingTest : public UnitTest
 {
    Q_OBJECT