From 9d82f4bff8520c3f6db7790d9044c3dfc5cc84c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 20 Jan 2022 17:42:48 +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: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- examples/qml/referenceexamples/default/CMakeLists.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'examples/qml/referenceexamples/default/CMakeLists.txt') diff --git a/examples/qml/referenceexamples/default/CMakeLists.txt b/examples/qml/referenceexamples/default/CMakeLists.txt index 419b14d464..712266aa50 100644 --- a/examples/qml/referenceexamples/default/CMakeLists.txt +++ b/examples/qml/referenceexamples/default/CMakeLists.txt @@ -1,32 +1,27 @@ -# Generated from default.pro. - cmake_minimum_required(VERSION 3.16) project(default 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}/qml/referenceexamples/default") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Qml) qt_add_executable(default birthdayparty.cpp birthdayparty.h main.cpp person.cpp person.h ) + set_target_properties(default PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(default PUBLIC Qt::Core Qt::Qml -- cgit v1.2.3