diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 18:26:21 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-17 20:08:53 +0000 |
| commit | b45ce023950d9dc28342d5834f89bf30b6c9fc9f (patch) | |
| tree | 113c88fdf16d71b3319311693d29d7fdfeabdadc /examples/multimedia/video/mediaplayer | |
| parent | bb7bea80eda01fbb694071aedf3c1f981e70e348 (diff) | |
Improve examples CMakeLists.txt
- 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 <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 236eec9cbe35f018f0c0617d4a0d707dea85b0ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/multimedia/video/mediaplayer')
| -rw-r--r-- | examples/multimedia/video/mediaplayer/CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/examples/multimedia/video/mediaplayer/CMakeLists.txt b/examples/multimedia/video/mediaplayer/CMakeLists.txt index 097a56109..9255ad2da 100644 --- a/examples/multimedia/video/mediaplayer/CMakeLists.txt +++ b/examples/multimedia/video/mediaplayer/CMakeLists.txt @@ -2,17 +2,13 @@ cmake_minimum_required(VERSION 3.16) project(mediaplayer LANGUAGES CXX) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") + set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/mediaplayer") @@ -30,7 +26,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/video/mediaplayer") # endif() #endif() -find_package(Qt6 COMPONENTS Core Quick QuickControls2 Svg REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Core Quick QuickControls2 Svg) set(PROJECT_SOURCES main.cpp |