zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cmake create MissionManager library in src/MissionManager

QGC4.4
Daniel Agar 7 years ago
parent
4383f6969f
commit
1c00bea6a4
2 changed files with 78 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      src/CMakeLists.txt
  2. 76
      src/MissionManager/CMakeLists.txt

58
src/CMakeLists.txt
Unescape View File

@ -17,7 +17,6 @@ include_directories( @@ -17,7 +17,6 @@ include_directories(
FlightMap/Widgets
FollowMe
Joystick
MissionManager
PositionManager
qgcunittest
QmlControls
@ -78,26 +77,6 @@ if(BUILD_TESTING) @@ -78,26 +77,6 @@ if(BUILD_TESTING)
FactSystem/FactSystemTestPX4.cc
FactSystem/ParameterManagerTest.cc
MissionManager/CameraCalcTest.cc
MissionManager/CameraSectionTest.cc
MissionManager/CorridorScanComplexItemTest.cc
MissionManager/MissionCommandTreeTest.cc
MissionManager/MissionControllerManagerTest.cc
MissionManager/MissionControllerTest.cc
MissionManager/MissionItemTest.cc
MissionManager/MissionManagerTest.cc
MissionManager/MissionSettingsTest.cc
MissionManager/PlanMasterControllerTest.cc
MissionManager/QGCMapPolygonTest.cc
MissionManager/QGCMapPolylineTest.cc
MissionManager/SectionTest.cc
MissionManager/SimpleMissionItemTest.cc
MissionManager/SpeedSectionTest.cc
MissionManager/StructureScanComplexItemTest.cc
MissionManager/SurveyComplexItemTest.cc
MissionManager/TransectStyleComplexItemTest.cc
MissionManager/VisualMissionItemTest.cc
qgcunittest/FileDialogTest.cc
qgcunittest/FileManagerTest.cc
qgcunittest/FlightGearTest.cc
@ -266,40 +245,6 @@ add_library(qgc @@ -266,40 +245,6 @@ add_library(qgc
Joystick/JoystickManager.cc
Joystick/JoystickSDL.cc
MissionManager/CameraCalc.cc
MissionManager/CameraSection.cc
MissionManager/CameraSpec.cc
MissionManager/ComplexMissionItem.cc
MissionManager/CorridorScanComplexItem.cc
MissionManager/FixedWingLandingComplexItem.cc
MissionManager/GeoFenceController.cc
MissionManager/GeoFenceManager.cc
MissionManager/KML.cc
MissionManager/MissionCommandList.cc
MissionManager/MissionCommandTree.cc
MissionManager/MissionCommandUIInfo.cc
MissionManager/MissionController.cc
MissionManager/MissionItem.cc
MissionManager/MissionManager.cc
MissionManager/MissionSettingsItem.cc
MissionManager/PlanElementController.cc
MissionManager/PlanManager.cc
MissionManager/PlanMasterController.cc
MissionManager/QGCFenceCircle.cc
MissionManager/QGCFencePolygon.cc
MissionManager/QGCMapCircle.cc
MissionManager/QGCMapPolygon.cc
MissionManager/QGCMapPolyline.cc
MissionManager/RallyPoint.cc
MissionManager/RallyPointController.cc
MissionManager/RallyPointManager.cc
MissionManager/SimpleMissionItem.cc
MissionManager/SpeedSection.cc
MissionManager/StructureScanComplexItem.cc
MissionManager/SurveyComplexItem.cc
MissionManager/TransectStyleComplexItem.cc
MissionManager/VisualMissionItem.cc
PositionManager/PositionManager.cpp
PositionManager/SimulatedPosition.cc
@ -419,7 +364,6 @@ add_library(qgc @@ -419,7 +364,6 @@ add_library(qgc
comm/QGCFlightGearLink.h
comm/QGCHilLink.h
comm/QGCJSBSimLink.h
MissionManager/Section.h
QtLocationPlugin/QGCMapEngineData.h
uas/UAS.h
uas/UASInterface.h
@ -435,6 +379,7 @@ add_subdirectory(api) @@ -435,6 +379,7 @@ add_subdirectory(api)
add_subdirectory(Audio)
add_subdirectory(AutoPilotPlugins)
add_subdirectory(GPS)
add_subdirectory(MissionManager)
target_link_libraries(qgc
@ -462,6 +407,7 @@ target_link_libraries(qgc @@ -462,6 +407,7 @@ target_link_libraries(qgc
AutoPilotPlugins
gps
qwt # LinechartWidget
MissionManager
)
target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

76
src/MissionManager/CMakeLists.txt
Unescape View File

@ -0,0 +1,76 @@ @@ -0,0 +1,76 @@
set(EXTRA_SRC)
if(BUILD_TESTING)
list(APPEND EXTRA_SRC
CameraCalcTest.cc
CameraSectionTest.cc
CorridorScanComplexItemTest.cc
MissionCommandTreeTest.cc
MissionControllerManagerTest.cc
MissionControllerTest.cc
MissionItemTest.cc
MissionManagerTest.cc
MissionSettingsTest.cc
PlanMasterControllerTest.cc
QGCMapPolygonTest.cc
QGCMapPolylineTest.cc
SectionTest.cc
SimpleMissionItemTest.cc
SpeedSectionTest.cc
StructureScanComplexItemTest.cc
SurveyComplexItemTest.cc
TransectStyleComplexItemTest.cc
VisualMissionItemTest.cc
)
endif()
add_library(MissionManager
CameraCalc.cc
CameraSection.cc
CameraSpec.cc
ComplexMissionItem.cc
CorridorScanComplexItem.cc
FixedWingLandingComplexItem.cc
GeoFenceController.cc
GeoFenceManager.cc
KML.cc
MissionCommandList.cc
MissionCommandTree.cc
MissionCommandUIInfo.cc
MissionController.cc
MissionItem.cc
MissionManager.cc
MissionSettingsItem.cc
PlanElementController.cc
PlanManager.cc
PlanMasterController.cc
QGCFenceCircle.cc
QGCFencePolygon.cc
QGCMapCircle.cc
QGCMapPolygon.cc
QGCMapPolyline.cc
RallyPoint.cc
RallyPointController.cc
RallyPointManager.cc
SimpleMissionItem.cc
SpeedSection.cc
StructureScanComplexItem.cc
SurveyComplexItem.cc
TransectStyleComplexItem.cc
VisualMissionItem.cc
Section.h # shouldn't be listed here, but isn't named properly for AUTOMOC
${EXTRA_SRC}
)
target_link_libraries(MissionManager
PUBLIC
qgc
)
target_include_directories(MissionManager
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
Write Preview
Loading…
Cancel
Save