CMake: Linking Updates

mavlink · Feb 28, 2025 · 03af084 · 03af084
1 parent b7c6d6d
commit 03af084
Show file tree

Hide file tree

Showing 55 changed files with 101 additions and 134 deletions.
diff --git a/cmake/CreateWinInstaller.cmake b/cmake/CreateWinInstaller.cmake
@@ -24,7 +24,7 @@ set(QGC_NSIS_INSTALLER_PARAMETERS
     /DAPPNAME=QGroundControl
     /DEXENAME=QGroundControl
     /DORGNAME=org.mavlink.qgroundcontrol
-    /DDESTDIR=${CMAKE_BINARY_DIR}/staging
+    /DDESTDIR=${CMAKE_INSTALL_PREFIX}
     /NOCD
     "/XOutFile ${QGC_INSTALLER_OUT}"
     ${QGC_NSIS_INSTALLER_SCRIPT}

diff --git a/custom-example/qgcimages.qrc b/custom-example/qgcimages.qrc
@@ -86,7 +86,7 @@
 		<file alias="DatalinkLossLight.svg">../src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
 		<file alias="Disarmed.svg">../src/UI/toolbar/Images/Disarmed.svg</file>
 		<file alias="Disconnect.svg">../src/UI/toolbar/Images/Disconnect.svg</file>
-		<file alias="FirmwareUpgradeIcon.png">../src/VehicleSetup/FirmwareUpgradeIcon.png</file>
+		<file alias="FirmwareUpgradeIcon.png">../src/Vehicle/VehicleSetup/FirmwareUpgradeIcon.png</file>
 		<file alias="FollowComponentIcon.png">../src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
 		<file alias="FlightModesComponentIcon.png">../src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
 		<file alias="FloatingWindow.svg">../src/AnalyzeView/FloatingWindow.svg</file>
@@ -202,7 +202,7 @@
 		<file alias="VehicleNoseDownRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
 		<file alias="VehicleRight.png">../src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
 		<file alias="VehicleRightRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
-		<file alias="VehicleSummaryIcon.png">../src/VehicleSetup/VehicleSummaryIcon.png</file>
+		<file alias="VehicleSummaryIcon.png">../src/Vehicle/VehicleSetup/VehicleSummaryIcon.png</file>
 		<file alias="VehicleTailDown.png">../src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
 		<file alias="VehicleTailDownRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
 		<file alias="VehicleUpsideDown.png">../src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>

diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
@@ -38,7 +38,7 @@
 		<file alias="RemoteIDSettings.qml">../src/UI/preferences/RemoteIDSettings.qml</file>
 		<file alias="ESP8266Component.qml">../src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
 		<file alias="ESP8266ComponentSummary.qml">../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
-		<file alias="FirmwareUpgrade.qml">../src/VehicleSetup/FirmwareUpgrade.qml</file>
+		<file alias="FirmwareUpgrade.qml">../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml</file>
 		<file alias="QGroundControl/FlightDisplay/QGCVideoBackground.qml">../src/FlightDisplay/QGCVideoBackground.qml</file>
 		<file alias="FlightDisplayViewDummy.qml">../src/FlightDisplay/FlightDisplayViewDummy.qml</file>
 		<file alias="FlightDisplayViewUVC.qml">../src/FlightDisplay/FlightDisplayViewUVC.qml</file>
@@ -51,11 +51,11 @@
 		<file alias="HelpSettings.qml">../src/UI/preferences/HelpSettings.qml</file>
 		<file alias="IntegratedAttitudeIndicator.qml">../src/FlightMap/Widgets/IntegratedAttitudeIndicator.qml</file>
 		<file alias="IntegratedCompassAttitude.qml">../src/FlightMap/Widgets/IntegratedCompassAttitude.qml</file>
-		<file alias="JoystickConfig.qml">../src/VehicleSetup/JoystickConfig.qml</file>
-		<file alias="JoystickConfigAdvanced.qml">../src/VehicleSetup/JoystickConfigAdvanced.qml</file>
-		<file alias="JoystickConfigButtons.qml">../src/VehicleSetup/JoystickConfigButtons.qml</file>
-		<file alias="JoystickConfigCalibration.qml">../src/VehicleSetup/JoystickConfigCalibration.qml</file>
-		<file alias="JoystickConfigGeneral.qml">../src/VehicleSetup/JoystickConfigGeneral.qml</file>
+		<file alias="JoystickConfig.qml">../src/Vehicle/VehicleSetup/JoystickConfig.qml</file>
+		<file alias="JoystickConfigAdvanced.qml">../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml</file>
+		<file alias="JoystickConfigButtons.qml">../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml</file>
+		<file alias="JoystickConfigCalibration.qml">../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml</file>
+		<file alias="JoystickConfigGeneral.qml">../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml</file>
 		<file alias="LinkSettings.qml">../src/UI/preferences/LinkSettings.qml</file>
 		<file alias="LogDownloadPage.qml">../src/AnalyzeView/LogDownloadPage.qml</file>
 		<file alias="LogReplaySettings.qml">../src/UI/preferences/LogReplaySettings.qml</file>
@@ -74,7 +74,7 @@
 		<file alias="PlanViewSettings.qml">../src/UI/preferences/PlanViewSettings.qml</file>
 		<file alias="PlanViewToolBar.qml">../src/UI/toolbar/PlanViewToolBar.qml</file>
 		<file alias="PreFlightCheckList.qml">../src/FlightDisplay/PreFlightCheckList.qml</file>
-		<file alias="OpticalFlowSensor.qml">../src/VehicleSetup/OpticalFlowSensor.qml</file>
+		<file alias="OpticalFlowSensor.qml">../src/Vehicle/VehicleSetup/OpticalFlowSensor.qml</file>
 		<file alias="VerticalCompassAttitude.qml">../src/FlightMap/Widgets/VerticalCompassAttitude.qml</file>
 		<file alias="HorizontalCompassAttitude.qml">../src/FlightMap/Widgets/HorizontalCompassAttitude.qml</file>
 		<file alias="QGroundControl/Controls/AnalyzePage.qml">../src/AnalyzeView/AnalyzePage.qml</file>
@@ -283,8 +283,8 @@
 		<file alias="QGroundControl/ScreenTools/ScreenTools.qml">../src/QmlControls/ScreenTools.qml</file>
 		<file alias="RadioComponent.qml">../src/AutoPilotPlugins/Common/RadioComponent.qml</file>
 		<file alias="SerialSettings.qml">../src/UI/preferences/SerialSettings.qml</file>
-		<file alias="SetupParameterEditor.qml">../src/VehicleSetup/SetupParameterEditor.qml</file>
-		<file alias="SetupView.qml">../src/VehicleSetup/SetupView.qml</file>
+		<file alias="SetupParameterEditor.qml">../src/Vehicle/VehicleSetup/SetupParameterEditor.qml</file>
+		<file alias="SetupView.qml">../src/Vehicle/VehicleSetup/SetupView.qml</file>
 		<file alias="SettingsPage.qml">../src/UI/preferences/SettingsPage.qml</file>
 		<file alias="SettingsPagesModel.qml">../src/UI/SettingsPagesModel.qml</file>
 		<file alias="SimpleItemEditor.qml">../src/PlanView/SimpleItemEditor.qml</file>
@@ -294,7 +294,7 @@
 		<file alias="TcpSettings.qml">../src/UI/preferences/TcpSettings.qml</file>
 		<file alias="TelemetrySettings.qml">../src/UI/preferences/TelemetrySettings.qml</file>
 		<file alias="UdpSettings.qml">../src/UI/preferences/UdpSettings.qml</file>
-		<file alias="VehicleSummary.qml">../src/VehicleSetup/VehicleSummary.qml</file>
+		<file alias="VehicleSummary.qml">../src/Vehicle/VehicleSetup/VehicleSummary.qml</file>
 		<file alias="VibrationPage.qml">../src/AnalyzeView/VibrationPage.qml</file>
 		<file alias="VideoSettings.qml">../src/UI/preferences/VideoSettings.qml</file>
 		<file alias="VirtualJoystick.qml">../src/FlightDisplay/VirtualJoystick.qml</file>

diff --git a/qgcimages.qrc b/qgcimages.qrc
@@ -86,7 +86,7 @@
         <file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
         <file alias="Disarmed.svg">src/UI/toolbar/Images/Disarmed.svg</file>
         <file alias="Disconnect.svg">src/UI/toolbar/Images/Disconnect.svg</file>
-        <file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
+        <file alias="FirmwareUpgradeIcon.png">src/Vehicle/VehicleSetup/FirmwareUpgradeIcon.png</file>
         <file alias="FollowComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
         <file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
         <file alias="FloatingWindow.svg">src/AnalyzeView/FloatingWindow.svg</file>
@@ -203,7 +203,7 @@
         <file alias="VehicleNoseDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
         <file alias="VehicleRight.png">src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
         <file alias="VehicleRightRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
-        <file alias="VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
+        <file alias="VehicleSummaryIcon.png">src/Vehicle/VehicleSetup/VehicleSummaryIcon.png</file>
         <file alias="VehicleTailDown.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
         <file alias="VehicleTailDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
         <file alias="VehicleUpsideDown.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>

diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
@@ -38,7 +38,7 @@
         <file alias="RemoteIDSettings.qml">src/UI/preferences/RemoteIDSettings.qml</file>
         <file alias="ESP8266Component.qml">src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
         <file alias="ESP8266ComponentSummary.qml">src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
-        <file alias="FirmwareUpgrade.qml">src/VehicleSetup/FirmwareUpgrade.qml</file>
+        <file alias="FirmwareUpgrade.qml">src/Vehicle/VehicleSetup/FirmwareUpgrade.qml</file>
         <file alias="QGroundControl/FlightDisplay/QGCVideoBackground.qml">src/FlightDisplay/QGCVideoBackground.qml</file>
         <file alias="FlightDisplayViewDummy.qml">src/FlightDisplay/FlightDisplayViewDummy.qml</file>
         <file alias="FlightDisplayViewUVC.qml">src/FlightDisplay/FlightDisplayViewUVC.qml</file>
@@ -51,11 +51,11 @@
         <file alias="HelpSettings.qml">src/UI/preferences/HelpSettings.qml</file>
         <file alias="IntegratedAttitudeIndicator.qml">src/FlightMap/Widgets/IntegratedAttitudeIndicator.qml</file>
         <file alias="IntegratedCompassAttitude.qml">src/FlightMap/Widgets/IntegratedCompassAttitude.qml</file>
-        <file alias="JoystickConfig.qml">src/VehicleSetup/JoystickConfig.qml</file>
-        <file alias="JoystickConfigAdvanced.qml">src/VehicleSetup/JoystickConfigAdvanced.qml</file>
-        <file alias="JoystickConfigButtons.qml">src/VehicleSetup/JoystickConfigButtons.qml</file>
-        <file alias="JoystickConfigCalibration.qml">src/VehicleSetup/JoystickConfigCalibration.qml</file>
-        <file alias="JoystickConfigGeneral.qml">src/VehicleSetup/JoystickConfigGeneral.qml</file>
+        <file alias="JoystickConfig.qml">src/Vehicle/VehicleSetup/JoystickConfig.qml</file>
+        <file alias="JoystickConfigAdvanced.qml">src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml</file>
+        <file alias="JoystickConfigButtons.qml">src/Vehicle/VehicleSetup/JoystickConfigButtons.qml</file>
+        <file alias="JoystickConfigCalibration.qml">src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml</file>
+        <file alias="JoystickConfigGeneral.qml">src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml</file>
         <file alias="LinkSettings.qml">src/UI/preferences/LinkSettings.qml</file>
         <file alias="LogDownloadPage.qml">src/AnalyzeView/LogDownloadPage.qml</file>
         <file alias="LogReplaySettings.qml">src/UI/preferences/LogReplaySettings.qml</file>
@@ -73,7 +73,7 @@
         <file alias="PlanViewSettings.qml">src/UI/preferences/PlanViewSettings.qml</file>
         <file alias="PlanViewToolBar.qml">src/UI/toolbar/PlanViewToolBar.qml</file>
         <file alias="PreFlightCheckList.qml">src/FlightDisplay/PreFlightCheckList.qml</file>
-        <file alias="OpticalFlowSensor.qml">src/VehicleSetup/OpticalFlowSensor.qml</file>
+        <file alias="OpticalFlowSensor.qml">src/Vehicle/VehicleSetup/OpticalFlowSensor.qml</file>
         <file alias="VerticalCompassAttitude.qml">src/FlightMap/Widgets/VerticalCompassAttitude.qml</file>
         <file alias="HorizontalCompassAttitude.qml">src/FlightMap/Widgets/HorizontalCompassAttitude.qml</file>
         <file alias="QGroundControl/Controls/AnalyzePage.qml">src/AnalyzeView/AnalyzePage.qml</file>
@@ -294,8 +294,8 @@
         <file alias="QGroundControl/ScreenTools/ScreenTools.qml">src/QmlControls/ScreenTools.qml</file>
         <file alias="RadioComponent.qml">src/AutoPilotPlugins/Common/RadioComponent.qml</file>
         <file alias="SerialSettings.qml">src/UI/preferences/SerialSettings.qml</file>
-        <file alias="SetupParameterEditor.qml">src/VehicleSetup/SetupParameterEditor.qml</file>
-        <file alias="SetupView.qml">src/VehicleSetup/SetupView.qml</file>
+        <file alias="SetupParameterEditor.qml">src/Vehicle/VehicleSetup/SetupParameterEditor.qml</file>
+        <file alias="SetupView.qml">src/Vehicle/VehicleSetup/SetupView.qml</file>
         <file alias="SettingsPage.qml">src/UI/preferences/SettingsPage.qml</file>
         <file alias="SettingsPagesModel.qml">src/UI/SettingsPagesModel.qml</file>
         <file alias="SimpleItemEditor.qml">src/PlanView/SimpleItemEditor.qml</file>
@@ -305,7 +305,7 @@
         <file alias="TcpSettings.qml">src/UI/preferences/TcpSettings.qml</file>
         <file alias="TelemetrySettings.qml">src/UI/preferences/TelemetrySettings.qml</file>
         <file alias="UdpSettings.qml">src/UI/preferences/UdpSettings.qml</file>
-        <file alias="VehicleSummary.qml">src/VehicleSetup/VehicleSummary.qml</file>
+        <file alias="VehicleSummary.qml">src/Vehicle/VehicleSetup/VehicleSummary.qml</file>
         <file alias="VibrationPage.qml">src/AnalyzeView/VibrationPage.qml</file>
         <file alias="VideoSettings.qml">src/UI/preferences/VideoSettings.qml</file>
         <file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file>

diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt
@@ -117,15 +117,24 @@ CPMAddPackage(
         "EXPAT_SHARED_LIBS OFF"
 )
 
-if(TARGET EXPAT::EXPAT)
-    set(_EXIV2_ENABLE_XMP ON)
-else()
-    set(_EXIV2_ENABLE_XMP OFF)
+set(_EXIV2_ENABLE_XMP OFF)
+if(EXPAT_ADDED)
+    find_package(expat CONFIG QUIET)
+    if(NOT TARGET expat::expat)
+        find_package(EXPAT MODULE)
+        if(EXPAT_FOUND)
+            if(NOT TARGET expat::expat)
+                add_library(expat::expat INTERFACE IMPORTED)
+                target_link_libraries(expat::expat INTERFACE EXPAT::EXPAT)
+            endif()
+            set(_EXIV2_ENABLE_XMP ON)
+        endif()
+    endif()
 endif()
 
 CPMAddPackage(
     NAME exiv2
-    VERSION 0.28.4
+    VERSION 0.28.5
     GITHUB_REPOSITORY Exiv2/exiv2
     OPTIONS
         "EXIV2_ENABLE_XMP ${_EXIV2_ENABLE_XMP}"

diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt
@@ -55,10 +55,8 @@ target_link_libraries(APMAutoPilotPlugin
         Qt6::Core
         Qt6::Quick
         AutoPilotPlugins
-        CommonAutoPilotPlugin
         FactControls
         MAVLink
-        VehicleSetup
 )
 
 target_include_directories(APMAutoPilotPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(Common)
 if(NOT QGC_DISABLE_APM_PLUGIN)
     add_subdirectory(APM)
 endif()
@@ -22,7 +21,6 @@ target_link_libraries(AutoPilotPlugins
         FirmwarePlugin
         QGC
         Vehicle
-        VehicleSetup
     PUBLIC
         Qt6::Core
 )
@@ -32,3 +30,5 @@ target_include_directories(AutoPilotPlugins
         ${CMAKE_CURRENT_SOURCE_DIR}
         Generic
 )
+
+add_subdirectory(Common)
diff --git a/src/AutoPilotPlugins/Common/CMakeLists.txt b/src/AutoPilotPlugins/Common/CMakeLists.txt
@@ -1,23 +1,23 @@
 find_package(Qt6 REQUIRED COMPONENTS Core Network Quick)
 
-qt_add_library(CommonAutoPilotPlugin STATIC
-    ESP8266Component.cc
-    ESP8266Component.h
-    ESP8266ComponentController.cc
-    ESP8266ComponentController.h
-    MotorComponent.cc
-    MotorComponent.h
-    RadioComponentController.cc
-    RadioComponentController.h
-    SyslinkComponent.cc
-    SyslinkComponent.h
-    SyslinkComponentController.cc
-    SyslinkComponentController.h
+target_sources(AutoPilotPlugins
+    PRIVATE
+        ESP8266Component.cc
+        ESP8266Component.h
+        ESP8266ComponentController.cc
+        ESP8266ComponentController.h
+        MotorComponent.cc
+        MotorComponent.h
+        RadioComponentController.cc
+        RadioComponentController.h
+        SyslinkComponent.cc
+        SyslinkComponent.h
+        SyslinkComponentController.cc
+        SyslinkComponentController.h
 )
 
-target_link_libraries(CommonAutoPilotPlugin
+target_link_libraries(AutoPilotPlugins
     PRIVATE
-        AutoPilotPlugins
         FactSystem
         QGC
         Utilities
@@ -28,10 +28,9 @@ target_link_libraries(CommonAutoPilotPlugin
         Qt6::Quick
         FactControls
         MAVLink
-        VehicleSetup
 )
 
-target_include_directories(CommonAutoPilotPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(AutoPilotPlugins PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 # file(GLOB QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml)
 # file(GLOB QML_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Images/*.*)

diff --git a/src/AutoPilotPlugins/PX4/CMakeLists.txt b/src/AutoPilotPlugins/PX4/CMakeLists.txt
@@ -46,10 +46,8 @@ target_link_libraries(PX4AutoPilotPlugin
         Qt6::Core
         Qt6::Quick
         AutoPilotPlugins
-        CommonAutoPilotPlugin
         FactControls
         MAVLink
-        VehicleSetup
 )
 
 target_include_directories(PX4AutoPilotPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,7 +34,6 @@ add_subdirectory(Terrain)
 add_subdirectory(Utilities)
 add_subdirectory(UTMSP)
 add_subdirectory(Vehicle)
-add_subdirectory(VehicleSetup)
 add_subdirectory(VideoManager)
 add_subdirectory(Viewer3D)
 
@@ -54,7 +53,6 @@ target_link_libraries(QGC
         AutoPilotPlugins
         Camera
         Comms
-        CommonAutoPilotPlugin
         FactSystem
         FirmwarePlugin
         # FirstRunPromptDialogs
@@ -74,7 +72,6 @@ target_link_libraries(QGC
         # UI
         Utilities
         Vehicle
-        VehicleSetup
         Viewer3D
         VideoManager
     PUBLIC

diff --git a/src/FirmwarePlugin/APM/CMakeLists.txt b/src/FirmwarePlugin/APM/CMakeLists.txt
@@ -30,7 +30,6 @@ target_link_libraries(APMFirmwarePlugin
         Settings
         Utilities
         Vehicle
-        VehicleSetup
     PUBLIC
         Qt6::Core
         Qt6::Network

diff --git a/src/FirmwarePlugin/CMakeLists.txt b/src/FirmwarePlugin/CMakeLists.txt
@@ -24,11 +24,10 @@ target_link_libraries(FirmwarePlugin
     PRIVATE
         AutoPilotPlugins
         Camera
-        CommonAutoPilotPlugin
         MissionManager
         QGC
         Utilities
-        VehicleSetup
+        Vehicle
         $<$<NOT:$<BOOL:${QGC_DISABLE_APM_PLUGIN}>>:APMFirmwarePlugin>
         $<$<NOT:$<BOOL:${QGC_DISABLE_PX4_PLUGIN}>>:PX4FirmwarePlugin>
     PUBLIC

diff --git a/src/FirmwarePlugin/PX4/CMakeLists.txt b/src/FirmwarePlugin/PX4/CMakeLists.txt
@@ -21,8 +21,8 @@ target_link_libraries(PX4FirmwarePlugin
         PX4AutoPilotPlugin
         QGC
         Settings
-        VehicleSetup
         Utilities
+        Vehicle
     PUBLIC
         Qt6::Core
         FactSystem

diff --git a/src/Utilities/Compression/CMakeLists.txt b/src/Utilities/Compression/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories(Utilities PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 include(CPM)
 CPMAddPackage(
-    NAME ZLIB
+    NAME zlib
     VERSION 1.3.1
     GITHUB_REPOSITORY madler/zlib
     OPTIONS
@@ -32,10 +32,9 @@ CPMAddPackage(
         "SKIP_INSTALL_LIBRARIES ON"
         "SKIP_INSTALL_HEADERS ON"
         "SKIP_INSTALL_ALL ON"
-        "ZLIB_USE_STATIC_LIBS ON"
 )
 
-if(ZLIB_ADDED)
+if(zlib_ADDED)
     target_link_libraries(Utilities PRIVATE zlibstatic)
 else()
     find_package(Qt6ZlibPrivate REQUIRED)

diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
@@ -57,3 +57,4 @@ target_include_directories(Vehicle PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(Actuators)
 add_subdirectory(ComponentInformation)
 add_subdirectory(FactGroups)
+add_subdirectory(VehicleSetup)
diff --git a/src/VehicleSetup/Bootloader.cc → src/Vehicle/VehicleSetup/Bootloader.cc b/src/VehicleSetup/Bootloader.cc → src/Vehicle/VehicleSetup/Bootloader.cc
diff --git a/src/VehicleSetup/Bootloader.h → src/Vehicle/VehicleSetup/Bootloader.h b/src/VehicleSetup/Bootloader.h → src/Vehicle/VehicleSetup/Bootloader.h
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <QtCore/QObject>
+
 #ifdef Q_OS_ANDROID
 #include "qserialport.h"
 #else