Skip to content

Q
qgroundcontrol
Commit 7e5986b8 authored by James Goppert's avatar James Goppert
Browse files
Options

Few link errors left on cmake.

parent 8ba0c5b8
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 232 deletions
CMakeLists.txt
View file @ 7e5986b8
...@@ -164,7 +164,7 @@ install(FILES ...@@ -164,7 +164,7 @@ install(FILES
DESTINATION lib/pkgconfig DESTINATION lib/pkgconfig
) )
# internal library list definition / dep summary # dependency summary
message(STATUS "=======================================") message(STATUS "=======================================")
message(STATUS "\tLIBRARY\t\t\tBUILDING") message(STATUS "\tLIBRARY\t\t\tBUILDING")
message(STATUS "=======================================") message(STATUS "=======================================")
...@@ -186,10 +186,9 @@ else() ...@@ -186,10 +186,9 @@ else()
message(STATUS "\t\tPHONON\t\tNO") message(STATUS "\t\tPHONON\t\tNO")
endif (PHONON_FOUND) endif (PHONON_FOUND)
message(${PHONON_INCLUDE_DIR}) message(${PHONON_INCLUDE_DIR})
message(STATUS "=======================================") message(STATUS "=======================================")
# project wide flags # project flags
include (${QT_USE_FILE}) include (${QT_USE_FILE})
include_directories( include_directories(
src src
...@@ -219,20 +218,16 @@ include_directories( ...@@ -219,20 +218,16 @@ include_directories(
${PHONON_INCLUDE_DIR}/phonon ${PHONON_INCLUDE_DIR}/phonon
${MAVLINK_INCLUDE_DIRS} ${MAVLINK_INCLUDE_DIRS}
) )
set (commonLibs
link_libraries(
${SDL_LIBRARY} ${SDL_LIBRARY}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${OSG_LIBRARIES} ${OSG_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${PHONON_LIBS} ${PHONON_LIBS}
qextserialport
qmapcontrol
qwt
) )
add_definitions(-D_TTY_POSIX_) add_definitions(-D_TTY_POSIX_)
# forms # qgrouncontrol forms
set(qgroundcontrolUiSrc set(qgroundcontrolUiSrc
src/ui/MainWindow.ui src/ui/MainWindow.ui
src/ui/CommSettings.ui src/ui/CommSettings.ui
...@@ -280,110 +275,162 @@ set(qgroundcontrolUiSrc ...@@ -280,110 +275,162 @@ set(qgroundcontrolUiSrc
src/ui/QGCSettingsWidget.ui src/ui/QGCSettingsWidget.ui
) )
# non qt object headers # qgroundcontrol headers without Q_OBJECT
set(qgroundcontrolHdrs set (qgroundcontrolHdrs # r !grep -RL Q_OBJECT src | grep "^.*\.[h|hpp]$" | sed -e "s/^/\t/g"
src/Core.h src/QGC.h
src/GAudioOutput.h src/configuration.h
src/LogCompressor.h src/comm/OpalRT.h
src/MG.h src/comm/ParameterList.h
src/QGC.h src/comm/Parameter.h
src/Waypoint.h src/comm/QGCParamID.h
src/comm/AS4Protocol.h src/comm/QGCMAVLink.h
src/comm/LinkInterface.h src/MG.h
src/comm/LinkManager.h src/ui/map3D/WebImage.h
src/comm/MAVLinkProtocol.h src/ui/map3D/PixhawkCheetahGeode.h
src/comm/MAVLinkSimulationLink.h src/ui/map3D/WaypointGroupNode.h
src/comm/MAVLinkSimulationMAV.h src/ui/map3D/ImageWindowGeode.h
src/comm/MAVLinkSimulationWaypointPlanner.h src/ui/map3D/Imagery.h
src/comm/MAVLinkSwarmSimulationLink.h src/ui/map3D/QGCGlut.h
src/comm/MAVLinkSyntaxHighlighter.h src/ui/map3D/HUDScaleGeode.h
src/comm/MAVLinkXMLParser.h src/ui/map3D/Texture.h
src/comm/ProtocolInterface.h src/ui/map3D/GCManipulator.h
src/comm/QGCMAVLink.h src/ui/map3D/Q3DWidgetFactory.h
src/comm/SerialLink.h src/ui/map3D/TextureCache.h
src/comm/SerialLinkInterface.h src/ui/map3D/QOSGWidget.h
src/comm/SerialSimulationLink.h src/ui/map/Waypoint2DIcon.h
src/comm/UDPLink.h src/ui/map/MAV2DIcon.h
src/configuration.h src/ui/OgreWidget.h
src/input/JoystickInput.h src/ui/mavlink/DomItem.h
src/uas/ArduPilotMegaMAV.h src/ui/generated/ObjectDetectionView.h
src/uas/PxQuadMAV.h src/ui/generated/MAVLinkSettingsWidget.h
src/uas/QGCMAVLinkUASFactory.h src/ui/generated/SerialSettings.h
src/uas/SlugsMAV.h src/ui/generated/WaypointView.h
src/uas/UAS.h src/ui/generated/LineChart.h
src/uas/UASInterface.h src/ui/generated/UASList.h
src/uas/UASManager.h src/ui/generated/UASInfo.h
src/uas/UASWaypointManager.h src/ui/generated/MainWindow.h
src/ui/map/Waypoint2DIcon.h src/ui/generated/DebugConsole.h
src/ui/map/MAV2DIcon.h src/ui/generated/XMLCommProtocolWidget.h
) src/ui/generated/WatchdogView.h
src/ui/generated/WatchdogControl.h
src/ui/generated/UASControl.h
src/ui/generated/WatchdogProcessView.h
src/ui/generated/ParameterInterface.h
src/ui/generated/HDDisplay.h
src/ui/generated/WaypointList.h
src/ui/generated/JoystickWidget.h
src/ui/generated/QGCSensorSettingsWidget.h
src/ui/generated/MapWidget.h
src/ui/generated/AudioOutputWidget.h
src/ui/generated/UASView.h
src/ui/generated/CommSettings.h
src/input/Freenect.h
)
# qt object headers # qgroundcontrol headers with Q_OBJECT
set (qgroundcontrolMocSrc set(qgroundcontrolMocSrc # r !grep -Rl Q_OBJECT src | grep "^.*\.[h|hpp]$" | sed "s/^/\t/g"
src/ui/AudioOutputWidget.h src/Core.h
src/ui/CameraView.h src/uas/UASManager.h
src/ui/CommConfigurationWindow.h src/uas/UASWaypointManager.h
src/ui/DebugConsole.h src/uas/UASInterface.h
src/ui/HDDisplay.h src/uas/Logfile.h
src/ui/HSIDisplay.h src/uas/PxQuadMAV.h
src/ui/HUD.h src/uas/QGCMAVLinkUASFactory.h
src/ui/JoystickWidget.h src/uas/SlugsMAV.h
src/ui/MAVLinkSettingsWidget.h src/uas/UAS.h
src/ui/MainWindow.h src/uas/ArduPilotMegaMAV.h
src/ui/MapWidget.h src/Waypoint.h
src/ui/ObjectDetectionView.h src/LogCompressor.h
src/ui/ParameterInterface.h src/GAudioOutput.h
src/ui/QGCDataPlot2D.h src/comm/AS4Protocol.h
src/ui/QGCFirmwareUpdate.h src/comm/MAVLinkSwarmSimulationLink.h
src/ui/QGCMAVLinkLogPlayer.h src/comm/ProtocolInterface.h
src/ui/QGCMainWindowAPConfigurator.h src/comm/MAVLinkSyntaxHighlighter.h
src/ui/QGCParamWidget.h #src/comm/OpalLink.h
src/ui/QGCPxImuFirmwareUpdate.h src/comm/MAVLinkProtocol.h
src/ui/QGCRemoteControlView.h src/comm/SerialLinkInterface.h
src/ui/QGCSensorSettingsWidget.h src/comm/UDPLink.h
src/ui/QGCSettingsWidget.h src/comm/LinkManager.h
src/ui/QGCUDPLinkConfiguration.h src/comm/LinkInterface.h
src/ui/QGCWaypointListMulti.h src/comm/MAVLinkXMLParser.h
src/ui/QGCWebView.h src/comm/MAVLinkSimulationLink.h
src/ui/RadioCalibration/AbstractCalibrator.h src/comm/SerialSimulationLink.h
src/ui/RadioCalibration/AirfoilServoCalibrator.h src/comm/MAVLinkSimulationWaypointPlanner.h
src/ui/RadioCalibration/CurveCalibrator.h src/comm/MAVLinkSimulationMAV.h
src/ui/RadioCalibration/RadioCalibrationData.h #src/comm/QGCNMEAProtocol.h
src/ui/RadioCalibration/RadioCalibrationWindow.h src/comm/SerialLink.h
src/ui/RadioCalibration/SwitchCalibrator.h src/ui/QGCSettingsWidget.h
src/ui/SerialConfigurationWindow.h src/ui/map3D/WebImageCache.h
src/ui/SlugsDataSensorView.h src/ui/map3D/QGCGoogleEarthView.h
src/ui/SlugsHilSim.h src/ui/map3D/QMap3D.h
src/ui/SlugsPIDControl.h #src/ui/map3D/Pixhawk3DWidget.h
src/ui/SlugsPadCameraControl.h #src/ui/map3D/Q3DWidget.h
src/ui/SlugsVideoCamControl.h src/ui/map3D/QGCWebPage.h
src/ui/WaypointList.h src/ui/ObjectDetectionView.h
src/ui/WaypointView.h src/ui/SerialConfigurationWindow.h
src/ui/XMLCommProtocolWidget.h src/ui/QGCFirmwareUpdate.h
src/ui/designer/QGCActionButton.h src/ui/CommConfigurationWindow.h
src/ui/designer/QGCParamSlider.h src/ui/MAVLinkSettingsWidget.h
src/ui/designer/QGCToolWidget.h src/ui/SlugsDataSensorView.h
src/ui/designer/QGCToolWidgetItem.h src/ui/WaypointView.h
src/ui/linechart/IncrementalPlot.h src/ui/QGCPxImuFirmwareUpdate.h
src/ui/linechart/LinechartPlot.h src/ui/QGCWebView.h
src/ui/linechart/LinechartWidget.h src/ui/QGCDataPlot2D.h
src/ui/linechart/Linecharts.h src/ui/HSIDisplay.h
src/ui/linechart/ScrollZoomer.h src/ui/SlugsPadCameraControl.h
src/ui/linechart/Scrollbar.h src/ui/QGCMainWindowAPConfigurator.h
src/ui/map3D/QGCWebPage.h src/ui/MainWindow.h
src/ui/mavlink/DomItem.h src/ui/SlugsVideoCamControl.h
src/ui/mavlink/DomModel.h src/ui/DebugConsole.h
src/ui/uas/QGCUnconnectedInfoWidget.h src/ui/XMLCommProtocolWidget.h
src/ui/uas/UASControlWidget.h src/ui/uas/UASListWidget.h
src/ui/uas/UASInfoWidget.h src/ui/uas/UASInfoWidget.h
src/ui/uas/UASListWidget.h src/ui/uas/QGCUnconnectedInfoWidget.h
src/ui/uas/UASView.h src/ui/uas/UASControlWidget.h
src/ui/watchdog/WatchdogControl.h src/ui/uas/UASView.h
src/ui/watchdog/WatchdogProcessView.h src/ui/SlugsPIDControl.h
src/ui/watchdog/WatchdogView.h src/ui/HUD.h
src/ui/RadioCalibration/RadioCalibrationWindow.h
src/ui/RadioCalibration/RadioCalibrationData.h
src/ui/RadioCalibration/SwitchCalibrator.h
src/ui/RadioCalibration/AbstractCalibrator.h
src/ui/RadioCalibration/CurveCalibrator.h
src/ui/RadioCalibration/AirfoilServoCalibrator.h
src/ui/ParameterInterface.h
src/ui/linechart/LinechartWidget.h
src/ui/linechart/IncrementalPlot.h
src/ui/linechart/Scrollbar.h
src/ui/linechart/Linecharts.h
src/ui/linechart/ScrollZoomer.h
src/ui/linechart/LinechartPlot.h
src/ui/HDDisplay.h
src/ui/watchdog/WatchdogView.h
src/ui/watchdog/WatchdogControl.h
src/ui/watchdog/WatchdogProcessView.h
src/ui/QGCMAVLinkLogPlayer.h
src/ui/QGCUDPLinkConfiguration.h
#src/ui/OpalLinkConfigurationWindow.h
src/ui/mavlink/DomModel.h
src/ui/SlugsHilSim.h
src/ui/WaypointList.h
src/ui/JoystickWidget.h
src/ui/QGCWaypointListMulti.h
src/ui/CameraView.h
src/ui/QGCSensorSettingsWidget.h
src/ui/designer/QGCParamSliderPlugin.h
src/ui/designer/QGCToolWidgetItem.h
src/ui/designer/QGCParamSlider.h
src/ui/designer/QGCActionButton.h
src/ui/designer/QGCToolWidget.h
src/ui/QGCParamWidget.h
src/ui/MapWidget.h
src/ui/QGCRemoteControlView.h
src/ui/AudioOutputWidget.h
src/standalone/mavlinkgen/MAVLinkGen.h
src/input/JoystickInput.h
) )
# source # qgroundcontrol source
set (qgroundcontrolSrc set (qgroundcontrolSrc
src/main.cc src/main.cc
src/Core.cc src/Core.cc
...@@ -476,134 +523,104 @@ set (qgroundcontrolSrc ...@@ -476,134 +523,104 @@ set (qgroundcontrolSrc
src/ui/watchdog/WatchdogView.cc src/ui/watchdog/WatchdogView.cc
) )
set (qmapcontrolHdrs # qgroundcontrol linking
lib/QMapControl/src/googlemapadapter.h qt4_wrap_cpp(qgroundcontrolMoc ${qgroundcontrolMocSrc})
lib/QMapControl/src/circlepoint.h qt4_wrap_ui(qgroundcontrolUi ${qgroundcontrolUiSrc})
lib/QMapControl/src/mapnetwork.h qt4_add_resources(qgroundcontrolRsc ${qgroundcontrolRscSrc})
lib/QMapControl/src/wmsmapadapter.h add_executable(qgroundcontrol
lib/QMapControl/src/mapadapter.h ${qgroundcontrolSrc}
lib/QMapControl/src/geometrylayer.h ${qgroundcontrolMoc}
lib/QMapControl/src/linestring.h ${qgroundcontrolUi}
lib/QMapControl/src/mapcontrol.h ${qgroundcontrolRsc}
lib/QMapControl/src/tilemapadapter.h
lib/QMapControl/src/curve.h
lib/QMapControl/src/imagemanager.h
lib/QMapControl/src/layer.h
lib/QMapControl/src/maplayer.h
lib/QMapControl/src/geometry.h
lib/QMapControl/src/googlesatmapadapter.h
lib/QMapControl/src/point.h
lib/QMapControl/src/osmmapadapter.h
lib/QMapControl/src/gps_position.h
lib/QMapControl/src/layermanager.h
lib/QMapControl/src/fixedimageoverlay.h
lib/QMapControl/src/openaerialmapadapter.h
lib/QMapControl/src/emptymapadapter.h
lib/QMapControl/src/yahoomapadapter.h
lib/QMapControl/src/imagepoint.h
lib/QMapControl/qmapcontrol.h
) )
add_dependencies(qgroundcontrol MAVLINK)
target_link_libraries(qgroundcontrol ${commonLibs} qextserialport qmapcontrol qwt)
set (qmapcontrolSrc # qgroundcontrol install
lib/QMapControl/src/point.cpp install(TARGETS qgroundcontrol DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
lib/QMapControl/src/imagepoint.cpp
lib/QMapControl/src/yahoomapadapter.cpp
lib/QMapControl/src/layermanager.cpp
lib/QMapControl/src/circlepoint.cpp
lib/QMapControl/src/imagemanager.cpp
lib/QMapControl/src/maplayer.cpp
lib/QMapControl/src/geometrylayer.cpp
lib/QMapControl/src/mapadapter.cpp
lib/QMapControl/src/mapnetwork.cpp
lib/QMapControl/src/linestring.cpp
lib/QMapControl/src/osmmapadapter.cpp
lib/QMapControl/src/fixedimageoverlay.cpp
lib/QMapControl/src/layer.cpp
lib/QMapControl/src/openaerialmapadapter.cpp
lib/QMapControl/src/geometry.cpp
lib/QMapControl/src/mapcontrol.cpp
lib/QMapControl/src/tilemapadapter.cpp
lib/QMapControl/src/googlemapadapter.cpp
lib/QMapControl/src/wmsmapadapter.cpp
lib/QMapControl/src/googlesatmapadapter.cpp
lib/QMapControl/src/curve.cpp
lib/QMapControl/src/emptymapadapter.cpp
lib/QMapControl/src/gps_position.cpp
)
set (qwtHdrs # qwt library
src/lib/qwt/qwt_plot_panner.h #----------------------------------------------------------------------------
src/lib/qwt/qwt_plot_marker.h
src/lib/qwt/qwt_plot_curve.h # qwt headers without Q_OBJECT
src/lib/qwt/qwt_double_range.h set (qwtHdrs # r !grep -L Q_OBJECT src/lib/qwt/*.h*
src/lib/qwt/qwt_symbol.h
src/lib/qwt/qwt_event_pattern.h
src/lib/qwt/qwt_abstract_scale_draw.h src/lib/qwt/qwt_abstract_scale_draw.h
src/lib/qwt/qwt_abstract_scale.h
src/lib/qwt/qwt_array.h
src/lib/qwt/qwt_arrow_button.h
src/lib/qwt/qwt_clipper.h src/lib/qwt/qwt_clipper.h
src/lib/qwt/qwt_color_map.h
src/lib/qwt/qwt_compass_rose.h src/lib/qwt/qwt_compass_rose.h
src/lib/qwt/qwt_wheel.h
src/lib/qwt/qwt_raster_data.h
src/lib/qwt/qwt.h
src/lib/qwt/qwt_text_label.h
src/lib/qwt/qwt_legend_itemmanager.h
src/lib/qwt/qwt_picker.h
src/lib/qwt/qwt_layout_metrics.h
src/lib/qwt/qwt_curve_fitter.h src/lib/qwt/qwt_curve_fitter.h
src/lib/qwt/qwt_picker_machine.h src/lib/qwt/qwt_data.h
src/lib/qwt/qwt_magnifier.h src/lib/qwt/qwt_dial_needle.h
src/lib/qwt/qwt_round_scale_draw.h
src/lib/qwt/qwt_knob.h
src/lib/qwt/qwt_plot_svgitem.h
src/lib/qwt/qwt_plot_picker.h
src/lib/qwt/qwt_valuelist.h
src/lib/qwt/qwt_global.h
src/lib/qwt/qwt_plot_zoomer.h
src/lib/qwt/qwt_counter.h
src/lib/qwt/qwt_plot.h
src/lib/qwt/qwt_painter.h
src/lib/qwt/qwt_plot_canvas.h
src/lib/qwt/qwt_plot_item.h
src/lib/qwt/qwt_double_interval.h src/lib/qwt/qwt_double_interval.h
src/lib/qwt/qwt_plot_magnifier.h src/lib/qwt/qwt_double_range.h
src/lib/qwt/qwt_arrow_button.h src/lib/qwt/qwt_double_rect.h
src/lib/qwt/qwt_color_map.h src/lib/qwt/qwt_event_pattern.h
src/lib/qwt/qwt_math.h src/lib/qwt/qwt_global.h
src/lib/qwt/qwt_scale_map.h src/lib/qwt/qwt.h
src/lib/qwt/qwt_text_engine.h
src/lib/qwt/qwt_interval_data.h src/lib/qwt/qwt_interval_data.h
src/lib/qwt/qwt_dial.h src/lib/qwt/qwt_layout_metrics.h
src/lib/qwt/qwt_data.h src/lib/qwt/qwt_legend_itemmanager.h
src/lib/qwt/qwt_text.h src/lib/qwt/qwt_math.h
src/lib/qwt/qwt_polygon.h src/lib/qwt/qwt_paint_buffer.h
src/lib/qwt/qwt_plot_spectrogram.h src/lib/qwt/qwt_painter.h
src/lib/qwt/qwt_picker_machine.h
src/lib/qwt/qwt_plot_curve.h
src/lib/qwt/qwt_plot_dict.h
src/lib/qwt/qwt_plot_grid.h src/lib/qwt/qwt_plot_grid.h
src/lib/qwt/qwt_spline.h src/lib/qwt/qwt_plot_item.h
src/lib/qwt/qwt_scale_widget.h
src/lib/qwt/qwt_legend.h
src/lib/qwt/qwt_plot_layout.h src/lib/qwt/qwt_plot_layout.h
src/lib/qwt/qwt_dial_needle.h src/lib/qwt/qwt_plot_marker.h
src/lib/qwt/qwt_plot_printfilter.h
src/lib/qwt/qwt_plot_rasteritem.h
src/lib/qwt/qwt_plot_scaleitem.h
src/lib/qwt/qwt_plot_spectrogram.h
src/lib/qwt/qwt_plot_svgitem.h
src/lib/qwt/qwt_polygon.h
src/lib/qwt/qwt_raster_data.h
src/lib/qwt/qwt_rect.h src/lib/qwt/qwt_rect.h
src/lib/qwt/qwt_analog_clock.h src/lib/qwt/qwt_round_scale_draw.h
src/lib/qwt/qwt_dyngrid_layout.h src/lib/qwt/qwt_scale_div.h
src/lib/qwt/qwt_slider.h
src/lib/qwt/qwt_scale_draw.h src/lib/qwt/qwt_scale_draw.h
src/lib/qwt/qwt_plot_rasteritem.h
src/lib/qwt/qwt_legend_item.h
src/lib/qwt/qwt_scale_engine.h src/lib/qwt/qwt_scale_engine.h
src/lib/qwt/qwt_double_rect.h src/lib/qwt/qwt_scale_map.h
src/lib/qwt/qwt_abstract_scale.h src/lib/qwt/qwt_spline.h
src/lib/qwt/qwt_symbol.h
src/lib/qwt/qwt_text_engine.h
src/lib/qwt/qwt_text.h
src/lib/qwt/qwt_valuelist.h
)
# qwt headers with Q_OBJECT
set (qwtMocSrc # r !grep -l Q_OBJECT src/lib/qwt/*.h*
src/lib/qwt/qwt_abstract_slider.h src/lib/qwt/qwt_abstract_slider.h
src/lib/qwt/qwt_analog_clock.h
src/lib/qwt/qwt_compass.h src/lib/qwt/qwt_compass.h
src/lib/qwt/qwt_plot_scaleitem.h src/lib/qwt/qwt_counter.h
src/lib/qwt/qwt_dial.h
src/lib/qwt/qwt_dyngrid_layout.h
src/lib/qwt/qwt_knob.h
src/lib/qwt/qwt_legend.h
src/lib/qwt/qwt_legend_item.h
src/lib/qwt/qwt_magnifier.h
src/lib/qwt/qwt_panner.h src/lib/qwt/qwt_panner.h
src/lib/qwt/qwt_picker.h
src/lib/qwt/qwt_plot_canvas.h
src/lib/qwt/qwt_plot.h
src/lib/qwt/qwt_plot_magnifier.h
src/lib/qwt/qwt_plot_panner.h
src/lib/qwt/qwt_plot_picker.h
src/lib/qwt/qwt_plot_zoomer.h
src/lib/qwt/qwt_scale_widget.h
src/lib/qwt/qwt_slider.h
src/lib/qwt/qwt_text_label.h
src/lib/qwt/qwt_thermo.h src/lib/qwt/qwt_thermo.h
src/lib/qwt/qwt_plot_dict.h src/lib/qwt/qwt_wheel.h
src/lib/qwt/qwt_scale_div.h
src/lib/qwt/qwt_paint_buffer.h
src/lib/qwt/qwt_plot_printfilter.h
src/lib/qwt/qwt_array.h
) )
# qwt source
set (qwtSrc set (qwtSrc
src/lib/qwt/qwt_plot_magnifier.cpp src/lib/qwt/qwt_plot_magnifier.cpp
src/lib/qwt/qwt_plot_curve.cpp src/lib/qwt/qwt_plot_curve.cpp
...@@ -674,6 +691,15 @@ set (qwtSrc ...@@ -674,6 +691,15 @@ set (qwtSrc
src/lib/qwt/qwt_plot_grid.cpp src/lib/qwt/qwt_plot_grid.cpp
) )
# qwt linking
qt4_wrap_cpp(qwtMoc ${qwtMocSrc})
add_library(qwt ${qwtMoc} ${qwtSrc})
target_link_libraries(qwt ${commonLibs})
# qextserial library
#----------------------------------------------------------------------------
# qextserial headers without Q_OBJECT
set (qextserialportHdrs set (qextserialportHdrs
src/lib/qextserialport/qextserialport.h src/lib/qextserialport/qextserialport.h
src/lib/qextserialport/qextserialbase.h src/lib/qextserialport/qextserialbase.h
...@@ -682,6 +708,7 @@ set (qextserialportHdrs ...@@ -682,6 +708,7 @@ set (qextserialportHdrs
src/lib/qextserialport/qextserialenumerator.h src/lib/qextserialport/qextserialenumerator.h
) )
# qextserial headers with Q_OBJECT
set (qextserialportSrc set (qextserialportSrc
src/lib/qextserialport/posix_qextserialport.cpp src/lib/qextserialport/posix_qextserialport.cpp
src/lib/qextserialport/qextserialport.cpp src/lib/qextserialport/qextserialport.cpp
...@@ -690,23 +717,101 @@ set (qextserialportSrc ...@@ -690,23 +717,101 @@ set (qextserialportSrc
src/lib/qextserialport/qextserialenumerator.cpp src/lib/qextserialport/qextserialenumerator.cpp
) )
# qextserial linking
add_library(qextserialport ${qextserialportSrc}) add_library(qextserialport ${qextserialportSrc})
add_library(qmapcontrol ${qmapcontrolSrc}) target_link_libraries(qextserialport ${commonLibs})
add_library(qwt ${qwtSrc})
# process qt files # qmapcontrol library
qt4_wrap_cpp(qgroundcontrolMoc ${qgroundcontrolMocSrc}) #----------------------------------------------------------------------------
qt4_wrap_ui(qgroundcontrolUi ${qgroundcontrolUiSrc})
qt4_add_resources(qgroundcontrolRsc ${qgroundcontrolRscSrc})
#add executable # qmapcontrol headers without Q_OBJECT
add_executable(qgroundcontrol set (qmapcontrolHdrs
${qgroundcontrolSrc} lib/QMapControl/src/googlemapadapter.h
${qgroundcontrolMoc} lib/QMapControl/src/circlepoint.h
${qgroundcontrolUi} lib/QMapControl/src/mapnetwork.h
${qgroundcontrolRsc} lib/QMapControl/src/wmsmapadapter.h
lib/QMapControl/src/mapadapter.h
lib/QMapControl/src/geometrylayer.h
lib/QMapControl/src/linestring.h
lib/QMapControl/src/mapcontrol.h
lib/QMapControl/src/tilemapadapter.h
lib/QMapControl/src/curve.h
lib/QMapControl/src/imagemanager.h
lib/QMapControl/src/layer.h
lib/QMapControl/src/maplayer.h
lib/QMapControl/src/geometry.h
lib/QMapControl/src/googlesatmapadapter.h
lib/QMapControl/src/point.h
lib/QMapControl/src/osmmapadapter.h
lib/QMapControl/src/gps_position.h
lib/QMapControl/src/layermanager.h
lib/QMapControl/src/fixedimageoverlay.h
lib/QMapControl/src/openaerialmapadapter.h
lib/QMapControl/src/emptymapadapter.h
lib/QMapControl/src/yahoomapadapter.h
lib/QMapControl/src/imagepoint.h
lib/QMapControl/qmapcontrol.h
) )
add_dependencies(qgroundcontrol MAVLINK)
install(TARGETS qgroundcontrol DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) # qmapcontorl headers with Q_OBJECT
set (qmapcontrolMocSrc
lib/QMapControl/src/googlemapadapter.h
lib/QMapControl/src/circlepoint.h
lib/QMapControl/src/mapnetwork.h
lib/QMapControl/src/wmsmapadapter.h
lib/QMapControl/src/mapadapter.h
lib/QMapControl/src/geometrylayer.h
lib/QMapControl/src/linestring.h
lib/QMapControl/src/mapcontrol.h
lib/QMapControl/src/tilemapadapter.h
lib/QMapControl/src/curve.h
lib/QMapControl/src/imagemanager.h
lib/QMapControl/src/layer.h
lib/QMapControl/src/maplayer.h
lib/QMapControl/src/geometry.h
lib/QMapControl/src/googlesatmapadapter.h
lib/QMapControl/src/point.h
lib/QMapControl/src/osmmapadapter.h
lib/QMapControl/src/gps_position.h
lib/QMapControl/src/layermanager.h
lib/QMapControl/src/fixedimageoverlay.h
lib/QMapControl/src/openaerialmapadapter.h
lib/QMapControl/src/emptymapadapter.h
lib/QMapControl/src/yahoomapadapter.h
lib/QMapControl/src/imagepoint.h
lib/QMapControl/qmapcontrol.h
)
# qmapcontrol source
set (qmapcontrolSrc
lib/QMapControl/src/point.cpp
lib/QMapControl/src/imagepoint.cpp
lib/QMapControl/src/yahoomapadapter.cpp
lib/QMapControl/src/layermanager.cpp
lib/QMapControl/src/circlepoint.cpp
lib/QMapControl/src/imagemanager.cpp
lib/QMapControl/src/maplayer.cpp
lib/QMapControl/src/geometrylayer.cpp
lib/QMapControl/src/mapadapter.cpp
lib/QMapControl/src/mapnetwork.cpp
lib/QMapControl/src/linestring.cpp
lib/QMapControl/src/osmmapadapter.cpp
lib/QMapControl/src/fixedimageoverlay.cpp
lib/QMapControl/src/layer.cpp
lib/QMapControl/src/openaerialmapadapter.cpp
lib/QMapControl/src/geometry.cpp
lib/QMapControl/src/mapcontrol.cpp
lib/QMapControl/src/tilemapadapter.cpp
lib/QMapControl/src/googlemapadapter.cpp
lib/QMapControl/src/wmsmapadapter.cpp
lib/QMapControl/src/googlesatmapadapter.cpp
lib/QMapControl/src/curve.cpp
lib/QMapControl/src/emptymapadapter.cpp
lib/QMapControl/src/gps_position.cpp
)
# qmapcontrol linking
add_library(qmapcontrol ${qmapcontrolSrc})
target_link_libraries(qmapcontrol ${commonLibs})
# vim:ts=4:sw=4:expandtab # vim:ts=4:sw=4:expandtab
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment