Browse Source

fixes due to latest addition of libevents and new classes

QGC4.4
kistlin 4 years ago committed by Daniel Agar
parent
commit
e52a96be10
  1. 1
      libs/CMakeLists.txt
  2. 13
      libs/libevents/CMakeLists.txt
  3. 8
      src/Vehicle/CMakeLists.txt
  4. 3
      src/comm/CMakeLists.txt

1
libs/CMakeLists.txt

@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
add_subdirectory(libevents)
add_subdirectory(qtandroidserialport)
add_subdirectory(shapelib)
if (WIN32)

13
libs/libevents/CMakeLists.txt

@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
find_package(Qt5 COMPONENTS Core REQUIRED)
add_library(libevents_generated)
target_include_directories(libevents_generated INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libevents/libs/cpp/generated)
add_library(libevents_parser
definitions.cpp
libevents/libs/cpp/parse/parser.cpp
libevents/libs/cpp/protocol/receive.cpp
)
target_include_directories(libevents_parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(libevents_parser PUBLIC Qt5::Core)
target_link_libraries(libevents_parser PUBLIC comm)

8
src/Vehicle/CMakeLists.txt

@ -18,6 +18,8 @@ endif() @@ -18,6 +18,8 @@ endif()
add_library(Vehicle
CompInfo.cc
CompInfo.h
CompInfoEvents.cc
CompInfoEvents.h
CompInfoParam.cc
CompInfoParam.h
CompInfoGeneral.cc
@ -26,10 +28,14 @@ add_library(Vehicle @@ -26,10 +28,14 @@ add_library(Vehicle
ComponentInformationCache.h
ComponentInformationManager.cc
ComponentInformationManager.h
EventHandler.cc
EventHandler.h
FTPManager.cc
FTPManager.h
GPSRTKFactGroup.cc
GPSRTKFactGroup.h
HealthAndArmingChecks.cc
HealthAndArmingChecks.h
InitialConnectStateMachine.cc
InitialConnectStateMachine.h
MAVLinkLogManager.cc
@ -88,6 +94,8 @@ target_link_libraries(Vehicle @@ -88,6 +94,8 @@ target_link_libraries(Vehicle
PRIVATE
ui
compression
libevents_generated
libevents_parser
PUBLIC
qgc
)

3
src/comm/CMakeLists.txt

@ -43,9 +43,8 @@ add_library(comm @@ -43,9 +43,8 @@ add_library(comm
)
target_link_libraries(comm
PRIVATE
qgc
PUBLIC
qgc
Qt5::Location
Qt5::SerialPort
Qt5::Test

Loading…
Cancel
Save