From 2a1fe8400fb97308fe7e3eb70997c118e388a7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 19:30: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 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: Ifce5c3ebdc328269b491fa1e1e79e4cd5ef1f4db Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- examples/CMakeLists.txt | 2 -- examples/svg/CMakeLists.txt | 2 -- examples/svg/draganddrop/CMakeLists.txt | 2 -- .../svg/draganddrop/delayedencoding/CMakeLists.txt | 17 ++++------------- examples/svg/embedded/CMakeLists.txt | 2 -- examples/svg/embedded/desktopservices/CMakeLists.txt | 15 ++++----------- examples/svg/embedded/fluidlauncher/CMakeLists.txt | 15 ++++----------- examples/svg/embedded/weatherinfo/CMakeLists.txt | 18 ++++-------------- examples/svg/embeddedsvgviewer/CMakeLists.txt | 16 ++++------------ examples/svg/richtext/CMakeLists.txt | 2 -- examples/svg/richtext/textobject/CMakeLists.txt | 16 ++++------------ examples/svg/svggenerator/CMakeLists.txt | 16 +++++----------- examples/svg/svgviewer/CMakeLists.txt | 17 ++++------------- 13 files changed, 33 insertions(+), 107 deletions(-) (limited to 'examples') diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index a2cd1d5..93eeea6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from examples.pro. - qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(svg) diff --git a/examples/svg/CMakeLists.txt b/examples/svg/CMakeLists.txt index df76409..11f96f9 100644 --- a/examples/svg/CMakeLists.txt +++ b/examples/svg/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from svg.pro. - add_subdirectory(embedded) add_subdirectory(richtext) add_subdirectory(draganddrop) diff --git a/examples/svg/draganddrop/CMakeLists.txt b/examples/svg/draganddrop/CMakeLists.txt index 5cb8b4d..bf3af4a 100644 --- a/examples/svg/draganddrop/CMakeLists.txt +++ b/examples/svg/draganddrop/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draganddrop.pro. - if(TARGET Qt::Widgets) qt_internal_add_example(delayedencoding) endif() diff --git a/examples/svg/draganddrop/delayedencoding/CMakeLists.txt b/examples/svg/draganddrop/delayedencoding/CMakeLists.txt index 16ca249..12d1b1d 100644 --- a/examples/svg/draganddrop/delayedencoding/CMakeLists.txt +++ b/examples/svg/draganddrop/delayedencoding/CMakeLists.txt @@ -1,35 +1,27 @@ -# Generated from delayedencoding.pro. - cmake_minimum_required(VERSION 3.16) project(delayedencoding 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}/svg/draganddrop/delayedencoding") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg SvgWidgets Widgets) qt_add_executable(delayedencoding main.cpp mimedata.cpp mimedata.h sourcewidget.cpp sourcewidget.h ) + set_target_properties(delayedencoding PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(delayedencoding PUBLIC Qt::Core Qt::Gui @@ -38,7 +30,6 @@ target_link_libraries(delayedencoding PUBLIC Qt::Widgets ) - # Resources: set(delayedencoding_resource_files "images/drag.png" diff --git a/examples/svg/embedded/CMakeLists.txt b/examples/svg/embedded/CMakeLists.txt index c52cbe2..7c52f1c 100644 --- a/examples/svg/embedded/CMakeLists.txt +++ b/examples/svg/embedded/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from embedded.pro. - if(TARGET Qt::Widgets) qt_internal_add_example(desktopservices) endif() diff --git a/examples/svg/embedded/desktopservices/CMakeLists.txt b/examples/svg/embedded/desktopservices/CMakeLists.txt index 00a20f7..1534356 100644 --- a/examples/svg/embedded/desktopservices/CMakeLists.txt +++ b/examples/svg/embedded/desktopservices/CMakeLists.txt @@ -1,23 +1,15 @@ -# Generated from desktopservices.pro. - cmake_minimum_required(VERSION 3.16) project(desktopservices 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}/svg/embedded/desktopservices") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(desktopservices contenttab.cpp contenttab.h @@ -25,17 +17,18 @@ qt_add_executable(desktopservices linktab.cpp linktab.h main.cpp ) + set_target_properties(desktopservices PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(desktopservices PUBLIC Qt::Core Qt::Gui Qt::Widgets ) - # Resources: set(desktopservices_resource_files "resources/browser.png" diff --git a/examples/svg/embedded/fluidlauncher/CMakeLists.txt b/examples/svg/embedded/fluidlauncher/CMakeLists.txt index 1fc671c..7d66bf6 100644 --- a/examples/svg/embedded/fluidlauncher/CMakeLists.txt +++ b/examples/svg/embedded/fluidlauncher/CMakeLists.txt @@ -1,23 +1,15 @@ -# Generated from fluidlauncher.pro. - cmake_minimum_required(VERSION 3.16) project(fluidlauncher 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}/svg/embedded/fluidlauncher") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(fluidlauncher demoapplication.cpp demoapplication.h @@ -26,17 +18,18 @@ qt_add_executable(fluidlauncher pictureflow.cpp pictureflow.h slideshow.cpp slideshow.h ) + set_target_properties(fluidlauncher PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(fluidlauncher PUBLIC Qt::Core Qt::Gui Qt::Widgets ) - # Resources: set(fluidlauncher_resource_files "config.xml" diff --git a/examples/svg/embedded/weatherinfo/CMakeLists.txt b/examples/svg/embedded/weatherinfo/CMakeLists.txt index c87887e..44b24bd 100644 --- a/examples/svg/embedded/weatherinfo/CMakeLists.txt +++ b/examples/svg/embedded/weatherinfo/CMakeLists.txt @@ -1,34 +1,25 @@ -# Generated from weatherinfo.pro. - cmake_minimum_required(VERSION 3.16) project(svgweatherinfo 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}/svg/embedded/weatherinfo") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Network) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Svg SvgWidgets Widgets) qt_add_executable(svgweatherinfo weatherinfo.cpp ) + set_target_properties(svgweatherinfo PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(svgweatherinfo PUBLIC Qt::Core Qt::Gui @@ -38,7 +29,6 @@ target_link_libraries(svgweatherinfo PUBLIC Qt::Widgets ) - # Resources: set(weatherinfo_resource_files "icons/weather-few-clouds.svg" diff --git a/examples/svg/embeddedsvgviewer/CMakeLists.txt b/examples/svg/embeddedsvgviewer/CMakeLists.txt index 4c88210..b1e4faa 100644 --- a/examples/svg/embeddedsvgviewer/CMakeLists.txt +++ b/examples/svg/embeddedsvgviewer/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from embeddedsvgviewer.pro. - cmake_minimum_required(VERSION 3.16) project(embeddedsvgviewer 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}/svg/embeddedsvgviewer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(embeddedsvgviewer embeddedsvgviewer.cpp embeddedsvgviewer.h main.cpp ) + set_target_properties(embeddedsvgviewer PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(embeddedsvgviewer PUBLIC Qt::Core Qt::Gui @@ -35,7 +28,6 @@ target_link_libraries(embeddedsvgviewer PUBLIC Qt::Widgets ) - # Resources: set(embeddedsvgviewer_resource_files "files/default.svg" diff --git a/examples/svg/richtext/CMakeLists.txt b/examples/svg/richtext/CMakeLists.txt index 3495b91..203f55e 100644 --- a/examples/svg/richtext/CMakeLists.txt +++ b/examples/svg/richtext/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from richtext.pro. - if(TARGET Qt::Widgets) qt_internal_add_example(textobject) endif() diff --git a/examples/svg/richtext/textobject/CMakeLists.txt b/examples/svg/richtext/textobject/CMakeLists.txt index 463a4eb..0aedf87 100644 --- a/examples/svg/richtext/textobject/CMakeLists.txt +++ b/examples/svg/richtext/textobject/CMakeLists.txt @@ -1,34 +1,27 @@ -# Generated from textobject.pro. - cmake_minimum_required(VERSION 3.16) project(textobject 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}/svg/richtext/textobject") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(textobject main.cpp svgtextobject.cpp svgtextobject.h window.cpp window.h ) + set_target_properties(textobject PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(textobject PUBLIC Qt::Core Qt::Gui @@ -36,7 +29,6 @@ target_link_libraries(textobject PUBLIC Qt::Widgets ) - # Resources: set(resources_resource_files "files/heart.svg" diff --git a/examples/svg/svggenerator/CMakeLists.txt b/examples/svg/svggenerator/CMakeLists.txt index d2ed265..1202a90 100644 --- a/examples/svg/svggenerator/CMakeLists.txt +++ b/examples/svg/svggenerator/CMakeLists.txt @@ -1,24 +1,16 @@ -# Generated from svggenerator.pro. - cmake_minimum_required(VERSION 3.16) project(svggenerator 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}/svg/svggenerator") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg Widgets) qt_add_executable(svggenerator displaywidget.cpp displaywidget.h @@ -26,13 +18,16 @@ qt_add_executable(svggenerator main.cpp window.cpp window.h ) + set_target_properties(svggenerator PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_include_directories(svggenerator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) + set_target_properties(svggenerator PROPERTIES AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/forms") @@ -43,7 +38,6 @@ target_link_libraries(svggenerator PUBLIC Qt::Widgets ) - # Resources: set(svggenerator_resource_files "resources/shapes.dat" diff --git a/examples/svg/svgviewer/CMakeLists.txt b/examples/svg/svgviewer/CMakeLists.txt index c78b09b..cf66439 100644 --- a/examples/svg/svgviewer/CMakeLists.txt +++ b/examples/svg/svgviewer/CMakeLists.txt @@ -1,25 +1,15 @@ -# Generated from svgviewer.pro. - cmake_minimum_required(VERSION 3.16) project(svgviewer 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}/svg/svgviewer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Svg) -find_package(Qt6 COMPONENTS SvgWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Svg SvgWidgets Widgets) qt_add_executable(svgviewer exportdialog.cpp exportdialog.h @@ -27,10 +17,12 @@ qt_add_executable(svgviewer mainwindow.cpp mainwindow.h svgview.cpp svgview.h ) + set_target_properties(svgviewer PROPERTIES WIN32_EXECUTABLE FALSE MACOSX_BUNDLE TRUE ) + target_link_libraries(svgviewer PUBLIC Qt::Core Qt::Gui @@ -39,7 +31,6 @@ target_link_libraries(svgviewer PUBLIC Qt::Widgets ) - # Resources: set(svgviewer_resource_files "files/bubbles.svg" -- cgit v1.2.1