Commit f212a5bb authored by Daniel Agar's avatar Daniel Agar

cmake create FactSystem library in src/FactSystem

parent 5df65cdb
......@@ -8,8 +8,6 @@ include_directories(
${Qt5Location_PRIVATE_INCLUDE_DIRS}
Camera
FactSystem
FactSystem/FactControls
FlightDisplay
FlightMap/Widgets
FollowMe
......@@ -62,11 +60,6 @@ if(BUILD_TESTING)
list(APPEND QGC_SRC
FactSystem/FactSystemTestBase.cc
FactSystem/FactSystemTestGeneric.cc
FactSystem/FactSystemTestPX4.cc
FactSystem/ParameterManagerTest.cc
qgcunittest/FileDialogTest.cc
qgcunittest/FileManagerTest.cc
qgcunittest/FlightGearTest.cc
......@@ -168,15 +161,6 @@ add_library(qgc
Camera/QGCCameraIO.cc
Camera/QGCCameraManager.cc
FactSystem/Fact.cc
FactSystem/FactControls/FactPanelController.cc
FactSystem/FactGroup.cc
FactSystem/FactMetaData.cc
FactSystem/FactSystem.cc
FactSystem/FactValueSliderListModel.cc
FactSystem/ParameterManager.cc
FactSystem/SettingsFact.cc
FlightDisplay/VideoManager.cc
FlightMap/Widgets/ValuesWidgetController.cc
......@@ -283,6 +267,7 @@ add_subdirectory(api)
add_subdirectory(Audio)
add_subdirectory(AutoPilotPlugins)
add_subdirectory(comm)
add_subdirectory(FactSystem)
add_subdirectory(FirmwarePlugin)
add_subdirectory(GPS)
add_subdirectory(MissionManager)
......@@ -314,6 +299,7 @@ target_link_libraries(qgc
Audio
AutoPilotPlugins
comm
FactSystem
FirmwarePlugin
gps
qwt # LinechartWidget
......
set(EXTRA_SRC)
if(BUILD_TESTING)
list(APPEND EXTRA_SRC
FactSystemTestBase.cc
FactSystemTestGeneric.cc
FactSystemTestPX4.cc
ParameterManagerTest.cc
)
endif()
add_library(FactSystem
Fact.cc
FactControls/FactPanelController.cc
FactGroup.cc
FactMetaData.cc
FactSystem.cc
FactValueSliderListModel.cc
ParameterManager.cc
SettingsFact.cc
${EXTRA_SRC}
)
target_link_libraries(FactSystem
PUBLIC
qgc
)
target_include_directories(FactSystem
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
FactControls
)
......@@ -22,6 +22,8 @@ target_link_libraries(QmlControls
Qt5::Widgets
qgc
FactSystem
)
target_include_directories(QmlControls PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
......
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