Skip to content

Commit cefdcf2

Browse files
HTRamseyHTRamsey
committed
CMake: Linking Updates
1 parent 9faf531 commit cefdcf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+102
-135
lines changed

‎cmake/CreateWinInstaller.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set(QGC_NSIS_INSTALLER_PARAMETERS
2424
/DAPPNAME=QGroundControl
2525
/DEXENAME=QGroundControl
2626
/DORGNAME=org.mavlink.qgroundcontrol
27-
/DDESTDIR=${CMAKE_BINARY_DIR}/staging
27+
/DDESTDIR=${CMAKE_INSTALL_PREFIX}
2828
/NOCD
2929
"/XOutFile ${QGC_INSTALLER_OUT}"
3030
${QGC_NSIS_INSTALLER_SCRIPT}

‎custom-example/qgcimages.qrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<file alias="DatalinkLossLight.svg">../src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
8787
<file alias="Disarmed.svg">../src/UI/toolbar/Images/Disarmed.svg</file>
8888
<file alias="Disconnect.svg">../src/UI/toolbar/Images/Disconnect.svg</file>
89-
<file alias="FirmwareUpgradeIcon.png">../src/VehicleSetup/FirmwareUpgradeIcon.png</file>
89+
<file alias="FirmwareUpgradeIcon.png">../src/Vehicle/VehicleSetup/FirmwareUpgradeIcon.png</file>
9090
<file alias="FollowComponentIcon.png">../src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
9191
<file alias="FlightModesComponentIcon.png">../src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
9292
<file alias="FloatingWindow.svg">../src/AnalyzeView/FloatingWindow.svg</file>
@@ -202,7 +202,7 @@
202202
<file alias="VehicleNoseDownRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
203203
<file alias="VehicleRight.png">../src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
204204
<file alias="VehicleRightRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
205-
<file alias="VehicleSummaryIcon.png">../src/VehicleSetup/VehicleSummaryIcon.png</file>
205+
<file alias="VehicleSummaryIcon.png">../src/Vehicle/VehicleSetup/VehicleSummaryIcon.png</file>
206206
<file alias="VehicleTailDown.png">../src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
207207
<file alias="VehicleTailDownRotate.png">../src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
208208
<file alias="VehicleUpsideDown.png">../src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>

‎custom-example/qgroundcontrol.qrc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<file alias="RemoteIDSettings.qml">../src/UI/preferences/RemoteIDSettings.qml</file>
3939
<file alias="ESP8266Component.qml">../src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
4040
<file alias="ESP8266ComponentSummary.qml">../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
41-
<file alias="FirmwareUpgrade.qml">../src/VehicleSetup/FirmwareUpgrade.qml</file>
41+
<file alias="FirmwareUpgrade.qml">../src/Vehicle/VehicleSetup/FirmwareUpgrade.qml</file>
4242
<file alias="QGroundControl/FlightDisplay/QGCVideoBackground.qml">../src/FlightDisplay/QGCVideoBackground.qml</file>
4343
<file alias="FlightDisplayViewDummy.qml">../src/FlightDisplay/FlightDisplayViewDummy.qml</file>
4444
<file alias="FlightDisplayViewUVC.qml">../src/FlightDisplay/FlightDisplayViewUVC.qml</file>
@@ -51,11 +51,11 @@
5151
<file alias="HelpSettings.qml">../src/UI/preferences/HelpSettings.qml</file>
5252
<file alias="IntegratedAttitudeIndicator.qml">../src/FlightMap/Widgets/IntegratedAttitudeIndicator.qml</file>
5353
<file alias="IntegratedCompassAttitude.qml">../src/FlightMap/Widgets/IntegratedCompassAttitude.qml</file>
54-
<file alias="JoystickConfig.qml">../src/VehicleSetup/JoystickConfig.qml</file>
55-
<file alias="JoystickConfigAdvanced.qml">../src/VehicleSetup/JoystickConfigAdvanced.qml</file>
56-
<file alias="JoystickConfigButtons.qml">../src/VehicleSetup/JoystickConfigButtons.qml</file>
57-
<file alias="JoystickConfigCalibration.qml">../src/VehicleSetup/JoystickConfigCalibration.qml</file>
58-
<file alias="JoystickConfigGeneral.qml">../src/VehicleSetup/JoystickConfigGeneral.qml</file>
54+
<file alias="JoystickConfig.qml">../src/Vehicle/VehicleSetup/JoystickConfig.qml</file>
55+
<file alias="JoystickConfigAdvanced.qml">../src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml</file>
56+
<file alias="JoystickConfigButtons.qml">../src/Vehicle/VehicleSetup/JoystickConfigButtons.qml</file>
57+
<file alias="JoystickConfigCalibration.qml">../src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml</file>
58+
<file alias="JoystickConfigGeneral.qml">../src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml</file>
5959
<file alias="LinkSettings.qml">../src/UI/preferences/LinkSettings.qml</file>
6060
<file alias="LogDownloadPage.qml">../src/AnalyzeView/LogDownloadPage.qml</file>
6161
<file alias="LogReplaySettings.qml">../src/UI/preferences/LogReplaySettings.qml</file>
@@ -74,7 +74,7 @@
7474
<file alias="PlanViewSettings.qml">../src/UI/preferences/PlanViewSettings.qml</file>
7575
<file alias="PlanViewToolBar.qml">../src/UI/toolbar/PlanViewToolBar.qml</file>
7676
<file alias="PreFlightCheckList.qml">../src/FlightDisplay/PreFlightCheckList.qml</file>
77-
<file alias="OpticalFlowSensor.qml">../src/VehicleSetup/OpticalFlowSensor.qml</file>
77+
<file alias="OpticalFlowSensor.qml">../src/Vehicle/VehicleSetup/OpticalFlowSensor.qml</file>
7878
<file alias="VerticalCompassAttitude.qml">../src/FlightMap/Widgets/VerticalCompassAttitude.qml</file>
7979
<file alias="HorizontalCompassAttitude.qml">../src/FlightMap/Widgets/HorizontalCompassAttitude.qml</file>
8080
<file alias="QGroundControl/Controls/AnalyzePage.qml">../src/AnalyzeView/AnalyzePage.qml</file>
@@ -283,8 +283,8 @@
283283
<file alias="QGroundControl/ScreenTools/ScreenTools.qml">../src/QmlControls/ScreenTools.qml</file>
284284
<file alias="RadioComponent.qml">../src/AutoPilotPlugins/Common/RadioComponent.qml</file>
285285
<file alias="SerialSettings.qml">../src/UI/preferences/SerialSettings.qml</file>
286-
<file alias="SetupParameterEditor.qml">../src/VehicleSetup/SetupParameterEditor.qml</file>
287-
<file alias="SetupView.qml">../src/VehicleSetup/SetupView.qml</file>
286+
<file alias="SetupParameterEditor.qml">../src/Vehicle/VehicleSetup/SetupParameterEditor.qml</file>
287+
<file alias="SetupView.qml">../src/Vehicle/VehicleSetup/SetupView.qml</file>
288288
<file alias="SettingsPage.qml">../src/UI/preferences/SettingsPage.qml</file>
289289
<file alias="SettingsPagesModel.qml">../src/UI/SettingsPagesModel.qml</file>
290290
<file alias="SimpleItemEditor.qml">../src/PlanView/SimpleItemEditor.qml</file>
@@ -294,7 +294,7 @@
294294
<file alias="TcpSettings.qml">../src/UI/preferences/TcpSettings.qml</file>
295295
<file alias="TelemetrySettings.qml">../src/UI/preferences/TelemetrySettings.qml</file>
296296
<file alias="UdpSettings.qml">../src/UI/preferences/UdpSettings.qml</file>
297-
<file alias="VehicleSummary.qml">../src/VehicleSetup/VehicleSummary.qml</file>
297+
<file alias="VehicleSummary.qml">../src/Vehicle/VehicleSetup/VehicleSummary.qml</file>
298298
<file alias="VibrationPage.qml">../src/AnalyzeView/VibrationPage.qml</file>
299299
<file alias="VideoSettings.qml">../src/UI/preferences/VideoSettings.qml</file>
300300
<file alias="VirtualJoystick.qml">../src/FlightDisplay/VirtualJoystick.qml</file>

‎docs/en/qgc-dev-guide/getting_started/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Example commands to build a default QGC and run it afterwards:
137137
1. Configure:
138138

139139
```sh
140-
/Qt/6.8.2/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
140+
~/Qt/6.8.2/gcc_64/bin/qt-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
141141
```
142142

143143
Change the directory for qt-cmake to match your install location for Qt and the kit you want to use.

‎qgcimages.qrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<file alias="DatalinkLossLight.svg">src/AutoPilotPlugins/PX4/Images/DatalinkLossLight.svg</file>
8787
<file alias="Disarmed.svg">src/UI/toolbar/Images/Disarmed.svg</file>
8888
<file alias="Disconnect.svg">src/UI/toolbar/Images/Disconnect.svg</file>
89-
<file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
89+
<file alias="FirmwareUpgradeIcon.png">src/Vehicle/VehicleSetup/FirmwareUpgradeIcon.png</file>
9090
<file alias="FollowComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
9191
<file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/Common/Images/FlightModesComponentIcon.png</file>
9292
<file alias="FloatingWindow.svg">src/AnalyzeView/FloatingWindow.svg</file>
@@ -203,7 +203,7 @@
203203
<file alias="VehicleNoseDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png</file>
204204
<file alias="VehicleRight.png">src/AutoPilotPlugins/PX4/Images/VehicleRight.png</file>
205205
<file alias="VehicleRightRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleRightRotate.png</file>
206-
<file alias="VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
206+
<file alias="VehicleSummaryIcon.png">src/Vehicle/VehicleSetup/VehicleSummaryIcon.png</file>
207207
<file alias="VehicleTailDown.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png</file>
208208
<file alias="VehicleTailDownRotate.png">src/AutoPilotPlugins/PX4/Images/VehicleTailDownRotate.png</file>
209209
<file alias="VehicleUpsideDown.png">src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png</file>

‎qgroundcontrol.qrc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<file alias="RemoteIDSettings.qml">src/UI/preferences/RemoteIDSettings.qml</file>
3939
<file alias="ESP8266Component.qml">src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
4040
<file alias="ESP8266ComponentSummary.qml">src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
41-
<file alias="FirmwareUpgrade.qml">src/VehicleSetup/FirmwareUpgrade.qml</file>
41+
<file alias="FirmwareUpgrade.qml">src/Vehicle/VehicleSetup/FirmwareUpgrade.qml</file>
4242
<file alias="QGroundControl/FlightDisplay/QGCVideoBackground.qml">src/FlightDisplay/QGCVideoBackground.qml</file>
4343
<file alias="FlightDisplayViewDummy.qml">src/FlightDisplay/FlightDisplayViewDummy.qml</file>
4444
<file alias="FlightDisplayViewUVC.qml">src/FlightDisplay/FlightDisplayViewUVC.qml</file>
@@ -51,11 +51,11 @@
5151
<file alias="HelpSettings.qml">src/UI/preferences/HelpSettings.qml</file>
5252
<file alias="IntegratedAttitudeIndicator.qml">src/FlightMap/Widgets/IntegratedAttitudeIndicator.qml</file>
5353
<file alias="IntegratedCompassAttitude.qml">src/FlightMap/Widgets/IntegratedCompassAttitude.qml</file>
54-
<file alias="JoystickConfig.qml">src/VehicleSetup/JoystickConfig.qml</file>
55-
<file alias="JoystickConfigAdvanced.qml">src/VehicleSetup/JoystickConfigAdvanced.qml</file>
56-
<file alias="JoystickConfigButtons.qml">src/VehicleSetup/JoystickConfigButtons.qml</file>
57-
<file alias="JoystickConfigCalibration.qml">src/VehicleSetup/JoystickConfigCalibration.qml</file>
58-
<file alias="JoystickConfigGeneral.qml">src/VehicleSetup/JoystickConfigGeneral.qml</file>
54+
<file alias="JoystickConfig.qml">src/Vehicle/VehicleSetup/JoystickConfig.qml</file>
55+
<file alias="JoystickConfigAdvanced.qml">src/Vehicle/VehicleSetup/JoystickConfigAdvanced.qml</file>
56+
<file alias="JoystickConfigButtons.qml">src/Vehicle/VehicleSetup/JoystickConfigButtons.qml</file>
57+
<file alias="JoystickConfigCalibration.qml">src/Vehicle/VehicleSetup/JoystickConfigCalibration.qml</file>
58+
<file alias="JoystickConfigGeneral.qml">src/Vehicle/VehicleSetup/JoystickConfigGeneral.qml</file>
5959
<file alias="LinkSettings.qml">src/UI/preferences/LinkSettings.qml</file>
6060
<file alias="LogDownloadPage.qml">src/AnalyzeView/LogDownloadPage.qml</file>
6161
<file alias="LogReplaySettings.qml">src/UI/preferences/LogReplaySettings.qml</file>
@@ -73,7 +73,7 @@
7373
<file alias="PlanViewSettings.qml">src/UI/preferences/PlanViewSettings.qml</file>
7474
<file alias="PlanViewToolBar.qml">src/UI/toolbar/PlanViewToolBar.qml</file>
7575
<file alias="PreFlightCheckList.qml">src/FlightDisplay/PreFlightCheckList.qml</file>
76-
<file alias="OpticalFlowSensor.qml">src/VehicleSetup/OpticalFlowSensor.qml</file>
76+
<file alias="OpticalFlowSensor.qml">src/Vehicle/VehicleSetup/OpticalFlowSensor.qml</file>
7777
<file alias="VerticalCompassAttitude.qml">src/FlightMap/Widgets/VerticalCompassAttitude.qml</file>
7878
<file alias="HorizontalCompassAttitude.qml">src/FlightMap/Widgets/HorizontalCompassAttitude.qml</file>
7979
<file alias="QGroundControl/Controls/AnalyzePage.qml">src/AnalyzeView/AnalyzePage.qml</file>
@@ -294,8 +294,8 @@
294294
<file alias="QGroundControl/ScreenTools/ScreenTools.qml">src/QmlControls/ScreenTools.qml</file>
295295
<file alias="RadioComponent.qml">src/AutoPilotPlugins/Common/RadioComponent.qml</file>
296296
<file alias="SerialSettings.qml">src/UI/preferences/SerialSettings.qml</file>
297-
<file alias="SetupParameterEditor.qml">src/VehicleSetup/SetupParameterEditor.qml</file>
298-
<file alias="SetupView.qml">src/VehicleSetup/SetupView.qml</file>
297+
<file alias="SetupParameterEditor.qml">src/Vehicle/VehicleSetup/SetupParameterEditor.qml</file>
298+
<file alias="SetupView.qml">src/Vehicle/VehicleSetup/SetupView.qml</file>
299299
<file alias="SettingsPage.qml">src/UI/preferences/SettingsPage.qml</file>
300300
<file alias="SettingsPagesModel.qml">src/UI/SettingsPagesModel.qml</file>
301301
<file alias="SimpleItemEditor.qml">src/PlanView/SimpleItemEditor.qml</file>
@@ -305,7 +305,7 @@
305305
<file alias="TcpSettings.qml">src/UI/preferences/TcpSettings.qml</file>
306306
<file alias="TelemetrySettings.qml">src/UI/preferences/TelemetrySettings.qml</file>
307307
<file alias="UdpSettings.qml">src/UI/preferences/UdpSettings.qml</file>
308-
<file alias="VehicleSummary.qml">src/VehicleSetup/VehicleSummary.qml</file>
308+
<file alias="VehicleSummary.qml">src/Vehicle/VehicleSetup/VehicleSummary.qml</file>
309309
<file alias="VibrationPage.qml">src/AnalyzeView/VibrationPage.qml</file>
310310
<file alias="VideoSettings.qml">src/UI/preferences/VideoSettings.qml</file>
311311
<file alias="VirtualJoystick.qml">src/FlightDisplay/VirtualJoystick.qml</file>

‎src/AnalyzeView/CMakeLists.txt‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,24 @@ CPMAddPackage(
117117
"EXPAT_SHARED_LIBS OFF"
118118
)
119119

120-
if(TARGET EXPAT::EXPAT)
121-
set(_EXIV2_ENABLE_XMP ON)
122-
else()
123-
set(_EXIV2_ENABLE_XMP OFF)
120+
set(_EXIV2_ENABLE_XMP OFF)
121+
if(EXPAT_ADDED)
122+
find_package(expat CONFIG QUIET)
123+
if(NOT TARGET expat::expat)
124+
find_package(EXPAT MODULE)
125+
if(EXPAT_FOUND)
126+
if(NOT TARGET expat::expat)
127+
add_library(expat::expat INTERFACE IMPORTED)
128+
target_link_libraries(expat::expat INTERFACE EXPAT::EXPAT)
129+
endif()
130+
set(_EXIV2_ENABLE_XMP ON)
131+
endif()
132+
endif()
124133
endif()
125134

126135
CPMAddPackage(
127136
NAME exiv2
128-
VERSION 0.28.4
137+
VERSION 0.28.5
129138
GITHUB_REPOSITORY Exiv2/exiv2
130139
OPTIONS
131140
"EXIV2_ENABLE_XMP ${_EXIV2_ENABLE_XMP}"

‎src/AutoPilotPlugins/APM/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@ target_link_libraries(APMAutoPilotPlugin
5555
Qt6::Core
5656
Qt6::Quick
5757
AutoPilotPlugins
58-
CommonAutoPilotPlugin
5958
FactControls
6059
MAVLink
61-
VehicleSetup
6260
)
6361

6462
target_include_directories(APMAutoPilotPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

‎src/AutoPilotPlugins/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
add_subdirectory(Common)
21
if(NOT QGC_DISABLE_APM_PLUGIN)
32
add_subdirectory(APM)
43
endif()
@@ -22,7 +21,6 @@ target_link_libraries(AutoPilotPlugins
2221
FirmwarePlugin
2322
QGC
2423
Vehicle
25-
VehicleSetup
2624
PUBLIC
2725
Qt6::Core
2826
)
@@ -32,3 +30,5 @@ target_include_directories(AutoPilotPlugins
3230
${CMAKE_CURRENT_SOURCE_DIR}
3331
Generic
3432
)
33+
34+
add_subdirectory(Common)

‎src/AutoPilotPlugins/Common/CMakeLists.txt‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
find_package(Qt6 REQUIRED COMPONENTS Core Network Quick)
22

3-
qt_add_library(CommonAutoPilotPlugin STATIC
4-
ESP8266Component.cc
5-
ESP8266Component.h
6-
ESP8266ComponentController.cc
7-
ESP8266ComponentController.h
8-
MotorComponent.cc
9-
MotorComponent.h
10-
RadioComponentController.cc
11-
RadioComponentController.h
12-
SyslinkComponent.cc
13-
SyslinkComponent.h
14-
SyslinkComponentController.cc
15-
SyslinkComponentController.h
3+
target_sources(AutoPilotPlugins
4+
PRIVATE
5+
ESP8266Component.cc
6+
ESP8266Component.h
7+
ESP8266ComponentController.cc
8+
ESP8266ComponentController.h
9+
MotorComponent.cc
10+
MotorComponent.h
11+
RadioComponentController.cc
12+
RadioComponentController.h
13+
SyslinkComponent.cc
14+
SyslinkComponent.h
15+
SyslinkComponentController.cc
16+
SyslinkComponentController.h
1617
)
1718

18-
target_link_libraries(CommonAutoPilotPlugin
19+
target_link_libraries(AutoPilotPlugins
1920
PRIVATE
20-
AutoPilotPlugins
2121
FactSystem
2222
QGC
2323
Utilities
@@ -28,10 +28,9 @@ target_link_libraries(CommonAutoPilotPlugin
2828
Qt6::Quick
2929
FactControls
3030
MAVLink
31-
VehicleSetup
3231
)
3332

34-
target_include_directories(CommonAutoPilotPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
33+
target_include_directories(AutoPilotPlugins PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
3534

3635
# file(GLOB QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml)
3736
# file(GLOB QML_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Images/*.*)

0 commit comments

Comments
 (0)