diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-04-23 23:52:57 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-06-24 17:51:41 +0300 |
| commit | b872666cdd8c831a0d1de8facb0d816573fadd25 (patch) | |
| tree | 222ac9cc45eb0e5d5ba270d4da611040ed34ae32 /app/CMakeLists.txt | |
| parent | 0859af125169bf34a5b01f33a7b3831f031bfce2 (diff) | |
agl-compositor: Adapt alexa-viewer to using the agl-shell-desktop proto
Do not hide the app, for the time being.
Bug-AGL: SPEC-3447
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I15e5f40b2d3864dd8e251f75b0a4ba05487c7649
Diffstat (limited to 'app/CMakeLists.txt')
| -rw-r--r-- | app/CMakeLists.txt | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index a6f2986..9cdbaa9 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -24,24 +24,55 @@ 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 QuickWidgets REQUIRED) +find_package(Qt5Gui ${QT_MIN_VERSION} CONFIG REQUIRED Private) find_package(PkgConfig REQUIRED) +find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner) qt5_add_resources(RESOURCES alexa-viewer.qrc) PROJECT_TARGET_ADD(alexa-viewer) +add_custom_command( + OUTPUT agl-shell-desktop-client-protocol.h + COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header + < ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml + > ${CMAKE_SOURCE_DIR}/app/agl-shell-desktop-client-protocol.h + DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml +) + + +add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/app/agl-shell-desktop-client-protocol.h + COMMAND ${WAYLAND_SCANNER_EXECUTABLE} client-header + < ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml + > ${CMAKE_SOURCE_DIR}/app/agl-shell-desktop-client-protocol.h + DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml +) + +add_custom_command( + OUTPUT agl-shell-desktop-protocol.c + COMMAND ${WAYLAND_SCANNER_EXECUTABLE} code + < ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml + > ${CMAKE_BINARY_DIR}/app/agl-shell-desktop-protocol.c + DEPENDS ${CMAKE_SOURCE_DIR}/app/protocol/agl-shell-desktop.xml +) + add_executable(${TARGET_NAME} main.cpp + agl-shell-desktop-protocol.c + agl-shell-desktop-client-protocol.h + shell-desktop.cpp afbclient.cpp ${RESOURCES} ) -pkg_check_modules(QLIBWINDOWMGR REQUIRED qlibwindowmanager) pkg_check_modules(QLIBHOMESCREEN REQUIRED qlibhomescreen) pkg_check_modules(QTAPPFW REQUIRED qtappfw-voice-metadata) pkg_check_modules(LIBAFBWSC REQUIRED libafbwsc) +pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client) include_directories( + include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) ${QTAPPFW_INCLUDE_DIRS} ${LIBAFBWSC_INCLUDE_DIRS} ) @@ -49,7 +80,7 @@ include_directories( set_target_properties(${TARGET_NAME} PROPERTIES LABELS "EXECUTABLE" PREFIX "" - COMPILE_FLAGS "${QLIBWINDOWMGR_FLAGS} ${QLIBHOMESCREEN} ${QTAPPFW_FLAGS} ${EXTRAS_CFLAGS} -DFOR_AFB_BINDING" + COMPILE_FLAGS "${QLIBHOMESCREEN} ${QTAPPFW_FLAGS} ${EXTRAS_CFLAGS} -DFOR_AFB_BINDING" LINK_FLAGS "${BINDINGS_LINK_FLAG}" LINK_LIBRARIES "${EXTRAS_LIBRARIES}" OUTPUT_NAME "${TARGET_NAME}" @@ -58,9 +89,9 @@ set_target_properties(${TARGET_NAME} PROPERTIES target_link_libraries(${TARGET_NAME} Qt5::QuickControls2 Qt5::QuickWidgets - ${QLIBWINDOWMGR_LIBRARIES} ${QLIBHOMESCREEN_LIBRARIES} ${QTAPPFW_LIBRARIES} ${LIBAFBWSC_LIBRARIES} + ${WAYLAND_CLIENT_LIBRARIES} -lpthread ) |