From 7cf8ecf4cedc0d85623e6838e01ca9fa5b618a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 15 Dec 2021 16:25:28 +0100 Subject: androidnotifier: Simplify example CMakeLists.txt Building the example when not on android makes little sense. Therefore just error out in this case. Pick-to: 6.3 Change-Id: Ib7325156bcd8ffd1b9b3e67174d878f5731a4a4f Reviewed-by: Assam Boudjelthia --- .../platform/androidnotifier/CMakeLists.txt | 68 +++++++++++----------- 1 file changed, 35 insertions(+), 33 deletions(-) (limited to 'examples') diff --git a/examples/corelib/platform/androidnotifier/CMakeLists.txt b/examples/corelib/platform/androidnotifier/CMakeLists.txt index 31ea2336ac..5187c54ef5 100644 --- a/examples/corelib/platform/androidnotifier/CMakeLists.txt +++ b/examples/corelib/platform/androidnotifier/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(androidnotifier LANGUAGES CXX) +if(NOT ANDROID) + message(FATAL_ERROR "Example only works on Android") +endif() + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) @@ -15,38 +19,36 @@ find_package(Qt6 REQUIRED COMPONENTS Widgets) set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/corelib/platform/androidnotifier") -set(PROJECT_SOURCES - main.cpp - notificationclient.cpp - notificationclient.h +qt_add_executable(androidnotifier + MANUAL_FINALIZATION + main.cpp + notificationclient.cpp + notificationclient.h ) -if(ANDROID) - qt_add_executable(androidnotifier - MANUAL_FINALIZATION - ${PROJECT_SOURCES}) - target_link_libraries(androidnotifier PRIVATE Qt6::Widgets) - - set_property(TARGET androidnotifier APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/android) - - qt_finalize_executable(androidnotifier) - - set(qml_resource_files - "images/happy.png" - "images/sad.png" - ) - - qt_add_resources(androidnotifier "main" - PREFIX - "/" - FILES - ${qml_resource_files} - ) - - install(TARGETS androidnotifier - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" - ) -endif() +target_link_libraries(androidnotifier PRIVATE + Qt6::Widgets +) + +set_property(TARGET androidnotifier APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR + ${CMAKE_CURRENT_SOURCE_DIR}/android) + +qt_finalize_executable(androidnotifier) + +set(qml_resource_files + "images/happy.png" + "images/sad.png" +) + +qt_add_resources(androidnotifier "main" + PREFIX + "/" + FILES + ${qml_resource_files} +) + +install(TARGETS androidnotifier + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) -- cgit v1.2.3