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/multimediawidgets/camera/CMakeLists.txt | |
| 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/multimediawidgets/camera/CMakeLists.txt')
| -rw-r--r-- | examples/multimediawidgets/camera/CMakeLists.txt | 15 |
1 files changed, 3 insertions, 12 deletions
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" |