diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2020-01-03 18:13:33 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2020-01-03 23:07:34 +0000 |
| commit | faa6ebce32c5875687f028a4d6c990e33cf260d5 (patch) | |
| tree | 5e8f51a6107dbbdb42fa63ad4a88ea6e491d2065 /app/CMakeLists.txt | |
| parent | 6b250497f27c37cae1d005f06158146e47ec8800 (diff) | |
Add signal-composer speed and steering wheel event supporticefish_8.99.5icefish/8.99.58.99.5
Changes include:
- Pull in signal-composer support from libqtappfw
- Add a configuration file that controls whether the existing
canned animation behavior should be used, or events from
signal-composer should drive speeds and indicators.
- Add new icons provided by LF graphics team for cruise control
and lane departure warning, and drive their state based on
appropriate steering wheel events.
- Hide/show the digital vehicle/engine speed values in the
gauges based on the steering wheel info event. This is
intended to work in sync with changes to tbtnavi to have it
display larger speed indicators via an alternate page.
Bug-AGL: SPEC-3045, SPEC-3049
Change-Id: I77249f65b80596fe7f2af9fe29b3ed86b63a8a45
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/CMakeLists.txt')
| -rw-r--r-- | app/CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 9547426..a09fd1d 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -23,7 +23,7 @@ set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS}) -find_package(Qt5 COMPONENTS Core Gui QuickControls2 WebSockets QuickWidgets REQUIRED) +find_package(Qt5 COMPONENTS Core Gui QuickControls2 QuickWidgets REQUIRED) find_package(PkgConfig REQUIRED) qt5_add_resources(RESOURCES cluster-gauges.qrc images/images.qrc) @@ -36,11 +36,18 @@ add_executable(${TARGET_NAME} ) pkg_check_modules(QLIBWINMGR REQUIRED qlibwindowmanager) +pkg_check_modules(QTAPPFW REQUIRED qtappfw) +pkg_check_modules(GLIB REQUIRED glib-2.0) + +include_directories( + ${QTAPPFW_INCLUDE_DIRS} + ${GLIB_INCLUDE_DIRS} +) set_target_properties(${TARGET_NAME} PROPERTIES LABELS "EXECUTABLE" PREFIX "" - COMPILE_FLAGS "${QLIBWINMGR_FLAGS} ${EXTRAS_CFLAGS} -DFOR_AFB_BINDING" + COMPILE_FLAGS "${QLIBWINMGR_FLAGS} ${QTAPPFW_FLAGS} ${GLIB_FLAGS} ${EXTRAS_CFLAGS} -DFOR_AFB_BINDING" LINK_FLAGS "${BINDINGS_LINK_FLAG}" LINK_LIBRARIES "${EXTRAS_LIBRARIES}" OUTPUT_NAME "${TARGET_NAME}" @@ -50,4 +57,6 @@ target_link_libraries(${TARGET_NAME} Qt5::QuickControls2 Qt5::QuickWidgets ${QLIBWINMGR_LIBRARIES} + ${QTAPPFW_LIBRARIES} + ${GLIB_LDFLAGS} ) |