From b45ce023950d9dc28342d5834f89bf30b6c9fc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 18:26:21 +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 Change-Id: I9f60da23df1547d685439b0263fa5bf533b7c69e Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann (cherry picked from commit 236eec9cbe35f018f0c0617d4a0d707dea85b0ac) Reviewed-by: Qt Cherry-pick Bot --- examples/multimediawidgets/CMakeLists.txt | 2 -- examples/multimediawidgets/camera/CMakeLists.txt | 15 +++------------ examples/multimediawidgets/player/CMakeLists.txt | 13 ++++--------- examples/multimediawidgets/player/player.cpp | 2 +- examples/multimediawidgets/player/player.h | 3 ++- examples/multimediawidgets/player/playlistmodel.cpp | 2 +- .../multimediawidgets/player/qplaylistfileparser_p.h | 2 +- .../multimediawidgets/videographicsitem/CMakeLists.txt | 16 ++++------------ examples/multimediawidgets/videowidget/CMakeLists.txt | 16 ++++------------ 9 files changed, 20 insertions(+), 51 deletions(-) (limited to 'examples/multimediawidgets') diff --git a/examples/multimediawidgets/CMakeLists.txt b/examples/multimediawidgets/CMakeLists.txt index b7f0230cb..8d16458c2 100644 --- a/examples/multimediawidgets/CMakeLists.txt +++ b/examples/multimediawidgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from multimediawidgets.pro. - if(TARGET Qt::Widgets) qt_internal_add_example(camera) qt_internal_add_example(videographicsitem) diff --git a/examples/multimediawidgets/camera/CMakeLists.txt b/examples/multimediawidgets/camera/CMakeLists.txt index 53b858f78..ebcac8159 100644 --- a/examples/multimediawidgets/camera/CMakeLists.txt +++ b/examples/multimediawidgets/camera/CMakeLists.txt @@ -1,25 +1,16 @@ -# Generated from camera.pro. - cmake_minimum_required(VERSION 3.16) project(camera 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}/multimediawidgets/camera") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS MultimediaWidgets) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets) set(camera_form "") set(videosettings_form "") @@ -39,6 +30,7 @@ qt_add_executable(camera videosettings.cpp videosettings.h ${videosettings_form} metadatadialog.cpp metadatadialog.h ) + set_target_properties(camera PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE @@ -73,7 +65,6 @@ target_link_libraries(camera PUBLIC Qt::Widgets ) - # Resources: set(camera_resource_files "images/shutter.svg" diff --git a/examples/multimediawidgets/player/CMakeLists.txt b/examples/multimediawidgets/player/CMakeLists.txt index 8aa735e96..7c0304eaf 100644 --- a/examples/multimediawidgets/player/CMakeLists.txt +++ b/examples/multimediawidgets/player/CMakeLists.txt @@ -1,22 +1,15 @@ -# Generated from player.pro. - cmake_minimum_required(VERSION 3.16) project(player 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}/multimediawidgets/player") -find_package(Qt6 COMPONENTS Network) -find_package(Qt6 COMPONENTS MultimediaWidgets) +find_package(Qt6 REQUIRED COMPONENTS MultimediaWidgets Network) qt_add_executable(player main.cpp @@ -27,10 +20,12 @@ qt_add_executable(player qmediaplaylist.cpp qmediaplaylist.h qmediaplaylist_p.h qplaylistfileparser.cpp qplaylistfileparser_p.h ) + set_target_properties(player PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(player PUBLIC Qt::MultimediaWidgets Qt::Network diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index 1560b6e13..25722673d 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -52,9 +52,9 @@ #include "playercontrols.h" #include "playlistmodel.h" +#include "qmediaplaylist.h" #include "videowidget.h" -#include #include #include #include diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h index f93a761ea..3f1c51795 100644 --- a/examples/multimediawidgets/player/player.h +++ b/examples/multimediawidgets/player/player.h @@ -51,9 +51,10 @@ #ifndef PLAYER_H #define PLAYER_H +#include "qmediaplaylist.h" + #include #include -#include #include QT_BEGIN_NAMESPACE diff --git a/examples/multimediawidgets/player/playlistmodel.cpp b/examples/multimediawidgets/player/playlistmodel.cpp index f6e683410..28fc58a83 100644 --- a/examples/multimediawidgets/player/playlistmodel.cpp +++ b/examples/multimediawidgets/player/playlistmodel.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include "playlistmodel.h" -#include +#include "qmediaplaylist.h" #include #include diff --git a/examples/multimediawidgets/player/qplaylistfileparser_p.h b/examples/multimediawidgets/player/qplaylistfileparser_p.h index 590472d24..98011fce0 100644 --- a/examples/multimediawidgets/player/qplaylistfileparser_p.h +++ b/examples/multimediawidgets/player/qplaylistfileparser_p.h @@ -52,8 +52,8 @@ // #include "qtmultimediaglobal.h" +#include "qmediaplaylist.h" #include -#include QT_BEGIN_NAMESPACE diff --git a/examples/multimediawidgets/videographicsitem/CMakeLists.txt b/examples/multimediawidgets/videographicsitem/CMakeLists.txt index 8f10d3034..fb8f4d857 100644 --- a/examples/multimediawidgets/videographicsitem/CMakeLists.txt +++ b/examples/multimediawidgets/videographicsitem/CMakeLists.txt @@ -1,34 +1,26 @@ -# Generated from videographicsitem.pro. - cmake_minimum_required(VERSION 3.16) project(videographicsitem 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}/multimediawidgets/videographicsitem") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS MultimediaWidgets) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets) qt_add_executable(videographicsitem main.cpp videoplayer.cpp videoplayer.h ) + set_target_properties(videographicsitem PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(videographicsitem PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimediawidgets/videowidget/CMakeLists.txt b/examples/multimediawidgets/videowidget/CMakeLists.txt index 74a49da57..fbfaba50b 100644 --- a/examples/multimediawidgets/videowidget/CMakeLists.txt +++ b/examples/multimediawidgets/videowidget/CMakeLists.txt @@ -1,34 +1,26 @@ -# Generated from videowidget.pro. - cmake_minimum_required(VERSION 3.16) project(videowidget 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}/multimediawidgets/videowidget") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS MultimediaWidgets) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia MultimediaWidgets Widgets) qt_add_executable(videowidget main.cpp videoplayer.cpp videoplayer.h ) + set_target_properties(videowidget PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(videowidget PUBLIC Qt::Core Qt::Gui -- cgit v1.2.3