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/particles/CMakeLists.txt | 2 -- examples/quick/particles/affectors/CMakeLists.txt | 8 +++----- examples/quick/particles/emitters/CMakeLists.txt | 8 +++----- examples/quick/particles/imageparticle/CMakeLists.txt | 8 +++----- examples/quick/particles/itemparticle/CMakeLists.txt | 7 +++---- examples/quick/particles/system/CMakeLists.txt | 10 +++------- 6 files changed, 15 insertions(+), 28 deletions(-) (limited to 'examples/quick/particles') diff --git a/examples/quick/particles/CMakeLists.txt b/examples/quick/particles/CMakeLists.txt index 3a9aca610a..a9fb838e99 100644 --- a/examples/quick/particles/CMakeLists.txt +++ b/examples/quick/particles/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from particles.pro. - qt_internal_add_example(affectors) qt_internal_add_example(emitters) qt_internal_add_example(imageparticle) diff --git a/examples/quick/particles/affectors/CMakeLists.txt b/examples/quick/particles/affectors/CMakeLists.txt index 9434063429..afbf286112 100644 --- a/examples/quick/particles/affectors/CMakeLists.txt +++ b/examples/quick/particles/affectors/CMakeLists.txt @@ -1,24 +1,22 @@ cmake_minimum_required(VERSION 3.16) project(affectors 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/particles/affectors") -find_package(Qt6 COMPONENTS Core Gui Quick Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) add_subdirectory("../../shared" "shared") qt_add_executable(affectorsexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(affectorsexample PRIVATE Qt::Core Qt::Gui diff --git a/examples/quick/particles/emitters/CMakeLists.txt b/examples/quick/particles/emitters/CMakeLists.txt index bf68c59cf5..1203de6b59 100644 --- a/examples/quick/particles/emitters/CMakeLists.txt +++ b/examples/quick/particles/emitters/CMakeLists.txt @@ -1,24 +1,22 @@ cmake_minimum_required(VERSION 3.16) project(emitters 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/particles/emitters") -find_package(Qt6 COMPONENTS Core Gui Quick Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) add_subdirectory("../../shared" "shared") qt_add_executable(emittersexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(emittersexample PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick/particles/imageparticle/CMakeLists.txt b/examples/quick/particles/imageparticle/CMakeLists.txt index 387c5bdd41..41eab03f36 100644 --- a/examples/quick/particles/imageparticle/CMakeLists.txt +++ b/examples/quick/particles/imageparticle/CMakeLists.txt @@ -1,24 +1,22 @@ cmake_minimum_required(VERSION 3.16) project(imageparticle 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/particles/imageparticle") -find_package(Qt6 COMPONENTS Core Gui Quick Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) add_subdirectory("../../shared" "shared") qt_add_executable(imageparticleexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(imageparticleexample PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick/particles/itemparticle/CMakeLists.txt b/examples/quick/particles/itemparticle/CMakeLists.txt index 6df338e00e..be5fa2fc03 100644 --- a/examples/quick/particles/itemparticle/CMakeLists.txt +++ b/examples/quick/particles/itemparticle/CMakeLists.txt @@ -1,23 +1,22 @@ cmake_minimum_required(VERSION 3.16) project(itemparticle LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/particles/itemparticle") -find_package(Qt6 COMPONENTS Core Gui Quick Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) add_subdirectory("../../shared" "shared") qt_add_executable(itemparticleexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(itemparticleexample PUBLIC Qt::Core Qt::Gui diff --git a/examples/quick/particles/system/CMakeLists.txt b/examples/quick/particles/system/CMakeLists.txt index c8ab118550..f6c975a128 100644 --- a/examples/quick/particles/system/CMakeLists.txt +++ b/examples/quick/particles/system/CMakeLists.txt @@ -1,26 +1,22 @@ -# Generated from system.pro. - cmake_minimum_required(VERSION 3.16) project(system 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/particles/system") -find_package(Qt6 COMPONENTS Core Gui Quick Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) add_subdirectory("../../shared" "shared") qt_add_executable(systemexample WIN32 MACOSX_BUNDLE main.cpp ) + target_link_libraries(systemexample PUBLIC Qt::Core Qt::Gui -- cgit v1.2.3