diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-01-21 16:14:58 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-15 23:38:39 +0000 |
commit | 302b448870b0e2f9d6f643c7d67ead38863136d8 (patch) | |
tree | fbac99917b1dd534e5a4afd1aca1bec623000d74 /examples/qt3d/scene2d | |
parent | f45597c50df4afe2f1d62c387dcfd4228064e200 (diff) |
Improve examples CMakeLists.txt
- Remove # generated from xyz.pro comment from pro2cmake
- Remove "# special case" markers for 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: I42cb1788cd53082f71f6a67446dc94f502497dca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 97c866c75f5d60a79d799279f315d744fbcc2174)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/qt3d/scene2d')
-rw-r--r-- | examples/qt3d/scene2d/CMakeLists.txt | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/examples/qt3d/scene2d/CMakeLists.txt b/examples/qt3d/scene2d/CMakeLists.txt index 6b2350994..09eeb190c 100644 --- a/examples/qt3d/scene2d/CMakeLists.txt +++ b/examples/qt3d/scene2d/CMakeLists.txt @@ -1,35 +1,26 @@ -# Generated from scene2d.pro. - cmake_minimum_required(VERSION 3.16) project(scene2d 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}") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS 3DQuick) -find_package(Qt6 COMPONENTS 3DQuickExtras) +find_package(Qt6 REQUIRED COMPONENTS 3DQuick 3DQuickExtras Core Gui Qml Quick) -qt_add_executable(scene2dsample # special case +qt_add_executable(scene2dsample main.cpp ) -set_target_properties(scene2dsample PROPERTIES # special case + +set_target_properties(scene2dsample PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(scene2dsample PUBLIC # special case + +target_link_libraries(scene2dsample PUBLIC Qt::3DQuick Qt::3DQuickExtras Qt::Core @@ -38,7 +29,6 @@ target_link_libraries(scene2dsample PUBLIC # special case Qt::Quick ) - # Resources: set(scene2d_resource_files "LogoControls.qml" @@ -46,14 +36,14 @@ set(scene2d_resource_files "main.qml" ) -qt6_add_resources(scene2dsample "scene2d" # special case +qt6_add_resources(scene2dsample "scene2d" PREFIX "/" FILES ${scene2d_resource_files} ) -install(TARGETS scene2dsample # special case +install(TARGETS scene2dsample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |