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/quick/models/CMakeLists.txt | 2 -- examples/quick/models/abstractitemmodel/CMakeLists.txt | 11 +++-------- examples/quick/models/objectlistmodel/CMakeLists.txt | 11 +++-------- examples/quick/models/stringlistmodel/CMakeLists.txt | 11 +++-------- 4 files changed, 9 insertions(+), 26 deletions(-) (limited to 'examples/quick/models') diff --git a/examples/quick/models/CMakeLists.txt b/examples/quick/models/CMakeLists.txt index d92f9e4a27..775c42cf33 100644 --- a/examples/quick/models/CMakeLists.txt +++ b/examples/quick/models/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from models.pro. - qt_internal_add_example(abstractitemmodel) qt_internal_add_example(objectlistmodel) qt_internal_add_example(stringlistmodel) diff --git a/examples/quick/models/abstractitemmodel/CMakeLists.txt b/examples/quick/models/abstractitemmodel/CMakeLists.txt index 486e6d376a..1851bbf102 100644 --- a/examples/quick/models/abstractitemmodel/CMakeLists.txt +++ b/examples/quick/models/abstractitemmodel/CMakeLists.txt @@ -1,25 +1,21 @@ -# Generated from abstractitemmodel.pro. - cmake_minimum_required(VERSION 3.16) project(abstractitemmodel LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/abstractitemmodel") -find_package(Qt6 COMPONENTS Core Gui Qml Quick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) qt_add_executable(abstractitemmodelexample WIN32 MACOSX_BUNDLE main.cpp model.cpp ) + target_link_libraries(abstractitemmodelexample PUBLIC Qt::Core Qt::Gui @@ -27,7 +23,6 @@ target_link_libraries(abstractitemmodelexample PUBLIC Qt::Quick ) - # Resources: qt_add_qml_module(abstractitemmodelexample URI abstractitemmodel diff --git a/examples/quick/models/objectlistmodel/CMakeLists.txt b/examples/quick/models/objectlistmodel/CMakeLists.txt index 8dbee3ae0b..dd48968f4c 100644 --- a/examples/quick/models/objectlistmodel/CMakeLists.txt +++ b/examples/quick/models/objectlistmodel/CMakeLists.txt @@ -1,25 +1,21 @@ -# Generated from objectlistmodel.pro. - cmake_minimum_required(VERSION 3.16) project(objectlistmodel LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/objectlistmodel") -find_package(Qt6 COMPONENTS Core Gui Qml Quick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) qt_add_executable(objectlistmodelexample WIN32 MACOSX_BUNDLE dataobject.cpp main.cpp ) + target_link_libraries(objectlistmodelexample PUBLIC Qt::Core Qt::Gui @@ -27,7 +23,6 @@ target_link_libraries(objectlistmodelexample PUBLIC Qt::Quick ) - # Resources: qt_add_qml_module(objectlistmodelexample URI objectlistmodel diff --git a/examples/quick/models/stringlistmodel/CMakeLists.txt b/examples/quick/models/stringlistmodel/CMakeLists.txt index 3bfb3ca4bf..1f72cf3b07 100644 --- a/examples/quick/models/stringlistmodel/CMakeLists.txt +++ b/examples/quick/models/stringlistmodel/CMakeLists.txt @@ -1,24 +1,20 @@ -# Generated from stringlistmodel.pro. - cmake_minimum_required(VERSION 3.16) project(stringlistmodel LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/models/stringlistmodel") -find_package(Qt6 COMPONENTS Core Gui Qml Quick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) qt_add_executable(stringlistmodelexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(stringlistmodelexample PUBLIC Qt::Core Qt::Gui @@ -26,7 +22,6 @@ target_link_libraries(stringlistmodelexample PUBLIC Qt::Quick ) - # Resources: qt_add_qml_module(stringlistmodelexample URI stringlistmodel -- cgit v1.2.3