From a3ec2015794bc58a37b0017d86ba27d24987ff92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 16:06:13 +0100 Subject: Improve examples CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: Ia419531218b14a97699efcc4d6e41115c37ea83d Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- examples/charts/qmlchart/CMakeLists.txt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'examples/charts/qmlchart') diff --git a/examples/charts/qmlchart/CMakeLists.txt b/examples/charts/qmlchart/CMakeLists.txt index fd2aa325..b952cbb1 100644 --- a/examples/charts/qmlchart/CMakeLists.txt +++ b/examples/charts/qmlchart/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from qmlchart.pro. - cmake_minimum_required(VERSION 3.16) project(qmlchart LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/charts/qmlchart") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Charts) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 REQUIRED COMPONENTS Charts Core Gui Qml Quick) qt_add_executable(qmlchart main.cpp ) + set_target_properties(qmlchart PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(qmlchart PUBLIC Qt::Charts Qt::Core @@ -36,7 +29,6 @@ target_link_libraries(qmlchart PUBLIC Qt::Quick ) - # Resources: set(resources_resource_files "qml/qmlchart/MainForm.ui.qml" -- cgit v1.2.3