diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 18:26:21 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-17 16:54:43 +0100 |
commit | 236eec9cbe35f018f0c0617d4a0d707dea85b0ac (patch) | |
tree | fd0a00f3e3b4d74f85cd6ddf02b0639bc6f36834 /examples/multimedia | |
parent | 470f05674a3afd52023441baf17dbad216e99d39 (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
Pick-to: 6.3
Change-Id: I9f60da23df1547d685439b0263fa5bf533b7c69e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/multimedia')
-rw-r--r-- | examples/multimedia/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/multimedia/audiodecoder/CMakeLists.txt | 17 | ||||
-rw-r--r-- | examples/multimedia/audiodevices/CMakeLists.txt | 17 | ||||
-rw-r--r-- | examples/multimedia/audiooutput/CMakeLists.txt | 15 | ||||
-rw-r--r-- | examples/multimedia/audiorecorder/CMakeLists.txt | 17 | ||||
-rw-r--r-- | examples/multimedia/audiosource/CMakeLists.txt | 16 | ||||
-rw-r--r-- | examples/multimedia/declarative-camera/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/multimedia/devices/CMakeLists.txt | 15 | ||||
-rw-r--r-- | examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/multimedia/spectrum/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/multimedia/video/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/multimedia/video/mediaplayer/CMakeLists.txt | 8 | ||||
-rw-r--r-- | examples/multimedia/video/qmlvideo/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/multimedia/video/recorder/CMakeLists.txt | 8 |
14 files changed, 48 insertions, 117 deletions
diff --git a/examples/multimedia/CMakeLists.txt b/examples/multimedia/CMakeLists.txt index 40c83308e..6123c7994 100644 --- a/examples/multimedia/CMakeLists.txt +++ b/examples/multimedia/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from multimedia.pro. - qt_internal_add_example(audiodecoder) if(NOT ANDROID AND NOT IOS) qt_internal_add_example(devices) diff --git a/examples/multimedia/audiodecoder/CMakeLists.txt b/examples/multimedia/audiodecoder/CMakeLists.txt index 7d9638549..85b9a45be 100644 --- a/examples/multimedia/audiodecoder/CMakeLists.txt +++ b/examples/multimedia/audiodecoder/CMakeLists.txt @@ -1,35 +1,30 @@ -# Generated from audiodecoder.pro. - cmake_minimum_required(VERSION 3.16) project(audiodecoder 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}/multimedia/audiodecoder") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets) + if(ANDROID) - find_package(Qt6 COMPONENTS Widgets) + endif() qt_add_executable(audiodecoder audiodecoder.cpp audiodecoder.h main.cpp ) + set_target_properties(audiodecoder PROPERTIES WIN32_EXECUTABLE FALSE MACOSX_BUNDLE TRUE ) + target_link_libraries(audiodecoder PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/audiodevices/CMakeLists.txt b/examples/multimedia/audiodevices/CMakeLists.txt index 245b396be..6bf07e6e5 100644 --- a/examples/multimedia/audiodevices/CMakeLists.txt +++ b/examples/multimedia/audiodevices/CMakeLists.txt @@ -1,39 +1,32 @@ -# Generated from audiodevices.pro. - cmake_minimum_required(VERSION 3.16) project(audiodevices 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}/multimedia/audiodevices") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets) qt_add_executable(audiodevices audiodevices.cpp audiodevices.h audiodevicesbase.ui main.cpp ) + set_target_properties(audiodevices PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -# special case begin + target_include_directories(audiodevices PUBLIC ../shared ) -# special case end + target_link_libraries(audiodevices PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/audiooutput/CMakeLists.txt b/examples/multimedia/audiooutput/CMakeLists.txt index 7f94e9ce7..09e6d13ac 100644 --- a/examples/multimedia/audiooutput/CMakeLists.txt +++ b/examples/multimedia/audiooutput/CMakeLists.txt @@ -1,33 +1,26 @@ -# Generated from audiooutput.pro. - cmake_minimum_required(VERSION 3.16) project(audiooutput 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}/multimedia/audiooutput") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets) qt_add_executable(audiooutput audiooutput.cpp audiooutput.h main.cpp ) + set_target_properties(audiooutput PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(audiooutput PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/audiorecorder/CMakeLists.txt b/examples/multimedia/audiorecorder/CMakeLists.txt index de8bd4ffb..88b540805 100644 --- a/examples/multimedia/audiorecorder/CMakeLists.txt +++ b/examples/multimedia/audiorecorder/CMakeLists.txt @@ -1,30 +1,23 @@ -# Generated from audiorecorder.pro. - cmake_minimum_required(VERSION 3.16) project(audiorecorder 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}/multimedia/audiorecorder") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets) qt_add_executable(audiorecorder audiolevel.cpp audiolevel.h audiorecorder.cpp audiorecorder.h audiorecorder.ui main.cpp ) + set_target_properties(audiorecorder PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE @@ -32,11 +25,11 @@ set_target_properties(audiorecorder PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/audiorecorder.entitlements" ) -# special case begin + target_include_directories(audiorecorder PUBLIC ../shared ) -# special case end + target_link_libraries(audiorecorder PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/audiosource/CMakeLists.txt b/examples/multimedia/audiosource/CMakeLists.txt index 692a24564..8584dc2fb 100644 --- a/examples/multimedia/audiosource/CMakeLists.txt +++ b/examples/multimedia/audiosource/CMakeLists.txt @@ -1,36 +1,30 @@ cmake_minimum_required(VERSION 3.16) project(audiosource 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}/multimedia/audiosource") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Widgets) qt_add_executable(audiosource audiosource.cpp audiosource.h main.cpp ) + set_target_properties(audiosource PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -# special case begin + target_include_directories(audiosource PUBLIC ../shared ) -# special case end + target_link_libraries(audiosource PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/declarative-camera/CMakeLists.txt b/examples/multimedia/declarative-camera/CMakeLists.txt index be903f2b7..1ca30c525 100644 --- a/examples/multimedia/declarative-camera/CMakeLists.txt +++ b/examples/multimedia/declarative-camera/CMakeLists.txt @@ -1,29 +1,20 @@ -# Generated from declarative-camera.pro. - cmake_minimum_required(VERSION 3.16) project(declarative-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}/multimedia/declarative-camera") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Multimedia) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Qml Quick) qt_add_executable(declarative-camera qmlcamera.cpp ) + set_target_properties(declarative-camera PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE @@ -31,11 +22,11 @@ set_target_properties(declarative-camera PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_LIST_DIR}/declarative-camera.entitlements" ) -# special case begin + target_include_directories(declarative-camera PUBLIC ../shared ) -# special case end + target_link_libraries(declarative-camera PUBLIC Qt::Core Qt::Gui diff --git a/examples/multimedia/devices/CMakeLists.txt b/examples/multimedia/devices/CMakeLists.txt index d75b4f23f..3e19c12ec 100644 --- a/examples/multimedia/devices/CMakeLists.txt +++ b/examples/multimedia/devices/CMakeLists.txt @@ -1,36 +1,31 @@ -# Generated from audiodevices.pro. - cmake_minimum_required(VERSION 3.16) project(devices 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}/multimedia/devices") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Multimedia) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia) qt_add_executable(devices main.cpp ) + set_target_properties(devices PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(devices PUBLIC Qt::Core Qt::Gui Qt::Multimedia ) + install(TARGETS devices RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt index d348dde65..6c2af7a83 100644 --- a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt +++ b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Qt6 COMPONENTS Core REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Core) add_library(fftreal STATIC Array.h Array.hpp diff --git a/examples/multimedia/spectrum/CMakeLists.txt b/examples/multimedia/spectrum/CMakeLists.txt index dfc7b8939..aea65446d 100644 --- a/examples/multimedia/spectrum/CMakeLists.txt +++ b/examples/multimedia/spectrum/CMakeLists.txt @@ -1,19 +1,15 @@ cmake_minimum_required(VERSION 3.16) project(spectrum 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}/multimedia/spectrum") -find_package(Qt6 COMPONENTS Multimedia Widgets REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Multimedia Widgets) add_subdirectory(3rdparty/fftreal) diff --git a/examples/multimedia/video/CMakeLists.txt b/examples/multimedia/video/CMakeLists.txt index ced1ad737..d3f707074 100644 --- a/examples/multimedia/video/CMakeLists.txt +++ b/examples/multimedia/video/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from video.pro. - qt_internal_add_example(qmlvideo) if(TARGET Qt::QuickControls2) if(TARGET Qt::Svg) diff --git a/examples/multimedia/video/mediaplayer/CMakeLists.txt b/examples/multimedia/video/mediaplayer/CMakeLists.txt index 8fa99ee9f..f9e29d1fd 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 diff --git a/examples/multimedia/video/qmlvideo/CMakeLists.txt b/examples/multimedia/video/qmlvideo/CMakeLists.txt index 516f9b5c3..9ef73b090 100644 --- a/examples/multimedia/video/qmlvideo/CMakeLists.txt +++ b/examples/multimedia/video/qmlvideo/CMakeLists.txt @@ -1,25 +1,15 @@ -# Generated from qmlvideo.pro. - cmake_minimum_required(VERSION 3.16) project(qmlvideo 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}/multimedia/video/qmlvideo") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Multimedia) -find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Multimedia Qml Quick) qt_add_executable(qmlvideo frequencymonitor.cpp frequencymonitor.h @@ -29,6 +19,7 @@ qt_add_executable(qmlvideo main.cpp trace.h ) + set_target_properties(qmlvideo PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE @@ -50,17 +41,19 @@ target_link_libraries(qmlvideo PUBLIC Qt::Quick ) - # Resources: set_source_files_properties("images/folder.png" PROPERTIES QT_RESOURCE_ALIAS "folder.png" ) + set_source_files_properties("images/leaves.jpg" PROPERTIES QT_RESOURCE_ALIAS "leaves.jpg" ) + set_source_files_properties("images/up.png" PROPERTIES QT_RESOURCE_ALIAS "up.png" ) + set(qmlvideo_resource_files "images/folder.png" "images/leaves.jpg" diff --git a/examples/multimedia/video/recorder/CMakeLists.txt b/examples/multimedia/video/recorder/CMakeLists.txt index 5b213fe30..ab43bbb44 100644 --- a/examples/multimedia/video/recorder/CMakeLists.txt +++ b/examples/multimedia/video/recorder/CMakeLists.txt @@ -2,23 +2,19 @@ cmake_minimum_required(VERSION 3.16) project(recorder 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/recorder") find_package(QT NAMES Qt6 COMPONENTS Core Quick Multimedia REQUIRED) -find_package(Qt6 COMPONENTS Core Quick Multimedia REQUIRED) +find_package(Qt6 REQUIRED COMPONENTS Core Multimedia Quick) set(PROJECT_SOURCES main.cpp |