diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2022-03-21 09:49:28 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2022-03-22 13:58:00 +0000 |
| commit | 4bc6493ef950a6654067665578594b697527221f (patch) | |
| tree | 3965d9b720310c5d259dc47b96ac63b9e348d94f /app | |
| parent | 027d153252cd2c9acd9343a620371bc0602ec213 (diff) | |
Update for app framework removalmarlin_13.0.1marlin_13.0.0marlin/13.0.1marlin/13.0.013.0.113.0.0marlin
Changes:
- Remove the autobuild scripts and config.xml used by the app
framework widget build.
- Update the CMake files to just build a "cluster-gauges" binary
and install it into /usr/bin by default.
- Remove the code in main.cpp that handled reading the WebSocket
command-line arguments and passing them to binding related
code.
Bug-AGL: SPEC-4306
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6c6c80836931af3355f1b793a20e5ccdf683c48d
(cherry picked from commit 23eaf7da1f7d252aefddf9e41e52c745b7433b50)
Diffstat (limited to 'app')
| -rw-r--r-- | app/CMakeLists.txt | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 8e039e6..3bc2b4f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2018 Konsulko Group +# Copyright 2018,2022 Konsulko Group # # Author: Scott Murray <scott.murray@konsulko.com> # @@ -16,33 +16,32 @@ # limitations under the License. ########################################################################### -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) +project(cluster-gauges VERSION 2.0.0 LANGUAGES CXX) + +if(CMAKE_VERSION VERSION_LESS "3.7.0") + set(CMAKE_INCLUDE_CURRENT_DIR ON) +endif() +set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS}) + set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) -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) -PROJECT_TARGET_ADD(cluster-gauges) - -add_executable(${TARGET_NAME} +add_executable(${PROJECT_NAME} main.cpp ${RESOURCES} ) -set_target_properties(${TARGET_NAME} PROPERTIES - LABELS "EXECUTABLE" - PREFIX "" - COMPILE_FLAGS "${QLIBWINMGR_FLAGS} ${EXTRAS_CFLAGS} -DFOR_AFB_BINDING" - LINK_FLAGS "${BINDINGS_LINK_FLAG}" - LINK_LIBRARIES "${EXTRAS_LIBRARIES}" - OUTPUT_NAME "${TARGET_NAME}" -) - -target_link_libraries(${TARGET_NAME} +target_link_libraries(${PROJECT_NAME} Qt5::QuickControls2 Qt5::QuickWidgets - ${QLIBWINMGR_LIBRARIES} ) + +install(TARGETS ${PROJECT_NAME} DESTINATION bin) |