Improve CMake Libraries

mavlink · Mar 13, 2024 · 37315ab · 37315ab
1 parent 927e79d
commit 37315ab
Show file tree

Hide file tree

Showing 53 changed files with 523 additions and 435 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,9 +149,6 @@ message(STATUS "QGroundControl version: ${APP_VERSION_STR}")
 #                QGroundControl Resources
 #######################################################
 
-add_subdirectory(libs)
-add_subdirectory(src)
-
 set(QGC_RESOURCES
     ${CMAKE_SOURCE_DIR}/qgcimages.qrc
     ${CMAKE_SOURCE_DIR}/qgcresources.qrc
@@ -186,11 +183,16 @@ endif()
 
 qt_add_executable(${PROJECT_NAME} src/main.cc ${QGC_RESOURCES})
 
+add_subdirectory(libs)
+add_subdirectory(src)
+
 set_target_properties(${PROJECT_NAME}
     PROPERTIES
         QT_RESOURCE_PREFIX "/qgc"
 )
 
+target_precompile_headers(${PROJECT_NAME} PRIVATE src/pch.h)
+
 if(Qt6LinguistTools_FOUND)
     file(GLOB TS_SOURCES RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/translations/qgc_*.ts)
     # TODO: Update to new qt_add_translations form in Qt6.7

diff --git a/libs/qmlglsink/CMakeLists.txt b/libs/qmlglsink/CMakeLists.txt
@@ -95,7 +95,7 @@ if(QGC_ENABLE_VIDEOSTREAMING)
 				${GST_LINK_LIBRARIES}
 		)
 
-		target_include_directories(qmlglsink PRIVATE ${GST_INCLUDE_DIRS})
+		target_include_directories(qmlglsink PUBLIC ${GST_INCLUDE_DIRS})
 		if (MSVC)
 			target_include_directories(qmlglsink PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/windows)
 		else()

diff --git a/libs/qtandroidserialport/src/qserialportinfo.cpp b/libs/qtandroidserialport/src/qserialportinfo.cpp
@@ -118,7 +118,7 @@ QSerialPortInfo::QSerialPortInfo(const QSerialPortInfoPrivate &dd)
 QSerialPortInfo::~QSerialPortInfo()
 {
 }
-#if 0
+
 /*! \fn void QSerialPortInfo::swap(QSerialPortInfo &other)
 
     Swaps QSerialPortInfo \a other with this QSerialPortInfo. This operation is
@@ -137,7 +137,7 @@ QSerialPortInfo& QSerialPortInfo::operator=(const QSerialPortInfo &other)
     QSerialPortInfo(other).swap(*this);
     return *this;
 }
-#endif
+
 /*!
     Returns the name of the serial port.
 

diff --git a/libs/qtandroidserialport/src/qserialportinfo.h b/libs/qtandroidserialport/src/qserialportinfo.h
@@ -42,7 +42,6 @@ QT_BEGIN_NAMESPACE
 
 class QSerialPort;
 class QSerialPortInfoPrivate;
-class QSerialPortInfoPrivateDeleter;
 
 class QSerialPortInfo
 {
@@ -78,7 +77,7 @@ class QSerialPortInfo
     static QList<qint32> standardBaudRates();
     static QList<QSerialPortInfo> availablePorts();
 
-    QScopedPointer<QSerialPortInfoPrivate, QSerialPortInfoPrivateDeleter> d_ptr;
+    std::unique_ptr<QSerialPortInfoPrivate> d_ptr;
 
 private:
     QSerialPortInfo(const QSerialPortInfoPrivate &dd);

diff --git a/libs/qtandroidserialport/src/qserialportinfo_p.h b/libs/qtandroidserialport/src/qserialportinfo_p.h
@@ -82,14 +82,6 @@ class Q_AUTOTEST_EXPORT QSerialPortInfoPrivate
     bool    hasProductIdentifier;
 };
 
-class QSerialPortInfoPrivateDeleter
-{
-public:
-    static void cleanup(QSerialPortInfoPrivate *p) {
-        delete p;
-    }
-};
-
 QT_END_NAMESPACE
 
 #endif // QSERIALPORTINFO_P_H
diff --git a/src/ADSB/CMakeLists.txt b/src/ADSB/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(Qt6 REQUIRED COMPONENTS Core Network Positioning)
 
 qt_add_library(ADSB STATIC
 	ADSBVehicle.cc
@@ -8,12 +9,12 @@ qt_add_library(ADSB STATIC
 
 target_link_libraries(ADSB
 	PUBLIC
+		Qt6::Core
+		Qt6::Network
+		Qt6::Positioning
+		comm
 		qgc
+		QmlControls
 )
 
-target_include_directories(ADSB
-	PUBLIC
-		${CMAKE_CURRENT_SOURCE_DIR}
-	)
-
-
+target_include_directories(ADSB PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/AirLink/CMakeLists.txt b/src/AirLink/CMakeLists.txt
@@ -1,20 +1,34 @@
-find_package(Qt6 COMPONENTS Core Network REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
-qt_add_library(AirLink STATIC
-    AirlinkLink.cc
-    AirlinkLink.h
-    AirLinkManager.cc
-    AirLinkManager.h
-    AirLinkSettings.qml
-)
+qt_add_library(AirLink STATIC)
 
-target_link_libraries(AirLink
-    PUBLIC
-        Qt6::Core
-        Qt6::Network
-        FactSystem
-        Settings
-        qgc
-)
+option(QGC_AIRLINK_DISABLED "Enable airlink" OFF)
+if(NOT ${QGC_AIRLINK_DISABLED})
+    find_package(Qt6 COMPONENTS Network REQUIRED)
 
-target_include_directories(AirLink PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_sources(AirLink
+        PRIVATE
+            AirlinkLink.cc
+            AirlinkLink.h
+            AirLinkManager.cc
+            AirLinkManager.h
+    )
+
+    add_custom_target(AirLinkQml
+        SOURCES
+            AirLinkSettings.qml
+    )
+
+    target_link_libraries(AirLink
+        PUBLIC
+            Qt6::Core
+            Qt6::Network
+            FactSystem
+            Settings
+            qgc
+    )
+
+    target_include_directories(AirLink PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+else()
+    target_compile_definitions(AirLink PUBLIC QGC_AIRLINK_DISABLED)
+endif()
diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(Qt6 REQUIRED COMPONENTS Core)
 
 qt_add_library(AnalyzeView STATIC
 	ExifParser.cc
@@ -34,7 +35,6 @@ target_link_libraries(AnalyzeView
 	PUBLIC
 		Qt6::Charts
 		Qt6::Location
-		Qt6::SerialPort
 		Qt6::TextToSpeech
 		Qt6::Widgets
 )

diff --git a/src/Audio/CMakeLists.txt b/src/Audio/CMakeLists.txt
@@ -1,16 +1,17 @@
+find_package(Qt6 REQUIRED COMPONENTS Core TextToSpeech Widgets)
 
 qt_add_library(Audio STATIC
 	AudioOutput.cc
+	AudioOutput.h
 )
 
 target_link_libraries(Audio
 	PRIVATE
+		Qt6::Widgets
 		qgc
 	PUBLIC
 		Qt6::Core
-		Qt6::Qml
 		Qt6::TextToSpeech
-		Qt6::Widgets
 )
 
 target_include_directories(Audio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt
@@ -1,36 +1,37 @@
-add_custom_target(APMAutoPilotPluginQml
-SOURCES
-    APMAirframeComponent.qml
-    APMAirframeComponentSummary.qml
-    APMCameraComponent.qml
-    APMCameraComponentSummary.qml
-    APMCameraSubComponent.qml
-    APMFlightModesComponent.qml
-    APMFlightModesComponentSummary.qml
-    APMHeliComponent.qml
-    APMLightsComponent.qml
-    APMLightsComponentSummary.qml
-    APMNotSupported.qml
-    APMPowerComponent.qml
-    APMPowerComponentSummary.qml
-    APMRadioComponentSummary.qml
-    APMRemoteSupportComponent.qml
-    APMSafetyComponent.qml
-    APMSafetyComponentCopter.qml
-    APMSafetyComponentPlane.qml
-    APMSafetyComponentRover.qml
-    APMSafetyComponentSub.qml
-    APMSafetyComponentSummary.qml
-    APMSafetyComponentSummaryCopter.qml
-    APMSafetyComponentSummaryPlane.qml
-    APMSafetyComponentSummaryRover.qml
-    APMSafetyComponentSummarySub.qml
-    APMSensorsComponent.qml
-    APMSensorsComponentSummary.qml
-    APMSubFrameComponent.qml
-    APMSubFrameComponentSummary.qml
-    APMSubMotorComponent.qml
-    APMTuningComponentCopter.qml
-    APMTuningComponentSub.qml
+find_package(Qt6 REQUIRED COMPONENTS Core Qml)
 
+add_custom_target(APMAutoPilotPluginQml
+    SOURCES
+        APMAirframeComponent.qml
+        APMAirframeComponentSummary.qml
+        APMCameraComponent.qml
+        APMCameraComponentSummary.qml
+        APMCameraSubComponent.qml
+        APMFlightModesComponent.qml
+        APMFlightModesComponentSummary.qml
+        APMHeliComponent.qml
+        APMLightsComponent.qml
+        APMLightsComponentSummary.qml
+        APMNotSupported.qml
+        APMPowerComponent.qml
+        APMPowerComponentSummary.qml
+        APMRadioComponentSummary.qml
+        APMRemoteSupportComponent.qml
+        APMSafetyComponent.qml
+        APMSafetyComponentCopter.qml
+        APMSafetyComponentPlane.qml
+        APMSafetyComponentRover.qml
+        APMSafetyComponentSub.qml
+        APMSafetyComponentSummary.qml
+        APMSafetyComponentSummaryCopter.qml
+        APMSafetyComponentSummaryPlane.qml
+        APMSafetyComponentSummaryRover.qml
+        APMSafetyComponentSummarySub.qml
+        APMSensorsComponent.qml
+        APMSensorsComponentSummary.qml
+        APMSubFrameComponent.qml
+        APMSubFrameComponentSummary.qml
+        APMSubMotorComponent.qml
+        APMTuningComponentCopter.qml
+        APMTuningComponentSub.qml
 )
diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
@@ -1,55 +1,83 @@
-
 add_subdirectory(APM)
 add_subdirectory(Common)
 add_subdirectory(PX4)
 
+find_package(Qt6 REQUIRED COMPONENTS Core)
+
 qt_add_library(AutoPilotPlugins STATIC
 	APM/APMAirframeComponent.cc
+	APM/APMAirframeComponent.h
 	APM/APMAirframeComponentController.cc
+	APM/APMAirframeComponentController.h
 	APM/APMAutoPilotPlugin.cc
+	APM/APMAutoPilotPlugin.h
 	APM/APMCameraComponent.cc
+	APM/APMCameraComponent.h
 	APM/APMFlightModesComponent.cc
+	APM/APMFlightModesComponent.h
 	APM/APMFlightModesComponentController.cc
+	APM/APMFlightModesComponentController.h
 	APM/APMFollowComponent.cc
+	APM/APMFollowComponent.h
 	APM/APMFollowComponentController.cc
+	APM/APMFollowComponentController.h
 	APM/APMHeliComponent.cc
+	APM/APMHeliComponent.h
 	APM/APMLightsComponent.cc
+	APM/APMLightsComponent.h
 	APM/APMMotorComponent.cc
+	APM/APMMotorComponent.h
 	APM/APMPowerComponent.cc
+	APM/APMPowerComponent.h
 	APM/APMRadioComponent.cc
+	APM/APMRadioComponent.h
 	APM/APMRemoteSupportComponent.cc
+	APM/APMRemoteSupportComponent.h
 	APM/APMSafetyComponent.cc
+	APM/APMSafetyComponent.h
 	APM/APMSensorsComponent.cc
+	APM/APMSensorsComponent.h
 	APM/APMSensorsComponentController.cc
+	APM/APMSensorsComponentController.h
 	APM/APMSubFrameComponent.cc
+	APM/APMSubFrameComponent.h
 	APM/APMSubMotorComponentController.cc
+	APM/APMSubMotorComponentController.h
 	APM/APMTuningComponent.cc
+	APM/APMTuningComponent.h
 
 	Common/ESP8266Component.cc
+	Common/ESP8266Component.h
 	Common/ESP8266ComponentController.cc
+	Common/ESP8266ComponentController.h
 	Common/MotorComponent.cc
+	Common/MotorComponent.h
 	Common/RadioComponentController.cc
+	Common/RadioComponentController.h
 	Common/SyslinkComponent.cc
+	Common/SyslinkComponent.h
 	Common/SyslinkComponentController.cc
+	Common/SyslinkComponentController.h
 
 	Generic/GenericAutoPilotPlugin.cc
+	Generic/GenericAutoPilotPlugin.h
 
 	PX4/ActuatorComponent.cc
 	PX4/ActuatorComponent.h
+	PX4/AirframeComponent.cc
+	PX4/AirframeComponent.h
 	PX4/AirframeComponentAirframes.cc
 	PX4/AirframeComponentAirframes.h
-	PX4/AirframeComponent.cc
 	PX4/AirframeComponentController.cc
 	PX4/AirframeComponentController.h
-	PX4/AirframeComponent.h
 	PX4/CameraComponent.cc
 	PX4/CameraComponent.h
 	PX4/FlightModesComponent.cc
 	PX4/FlightModesComponent.h
 	PX4/PowerComponent.cc
+	PX4/PowerComponent.h
 	PX4/PowerComponentController.cc
 	PX4/PowerComponentController.h
-	PX4/PowerComponent.h
 	PX4/PX4AirframeLoader.cc
 	PX4/PX4AirframeLoader.h
 	PX4/PX4AutoPilotPlugin.cc
@@ -65,11 +93,12 @@ qt_add_library(AutoPilotPlugins STATIC
 	PX4/SafetyComponent.cc
 	PX4/SafetyComponent.h
 	PX4/SensorsComponent.cc
+	PX4/SensorsComponent.h
 	PX4/SensorsComponentController.cc
 	PX4/SensorsComponentController.h
-	PX4/SensorsComponent.h
 
 	AutoPilotPlugin.cc
+	AutoPilotPlugin.h
 )
 
 target_link_libraries(AutoPilotPlugins
@@ -78,10 +107,9 @@ target_link_libraries(AutoPilotPlugins
 )
 
 target_include_directories(AutoPilotPlugins
-	INTERFACE
-		${CMAKE_CURRENT_SOURCE_DIR}
 	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
 		APM
 		Common
 		PX4
-	)
+)