diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-01-20 17:42:48 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-01-24 13:25:13 +0100 |
commit | 9d82f4bff8520c3f6db7790d9044c3dfc5cc84c0 (patch) | |
tree | 208f1e58e65083c7ddad2abdf1473679176fdaad /examples/quick/scenegraph/custommaterial/CMakeLists.txt | |
parent | a3924b9846f8f3412e6cfc3704f69488e64da98e (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
Pick-to: 6.3
Change-Id: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/quick/scenegraph/custommaterial/CMakeLists.txt')
-rw-r--r-- | examples/quick/scenegraph/custommaterial/CMakeLists.txt | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/examples/quick/scenegraph/custommaterial/CMakeLists.txt b/examples/quick/scenegraph/custommaterial/CMakeLists.txt index cbf6b0b5c7..a8ead8e39b 100644 --- a/examples/quick/scenegraph/custommaterial/CMakeLists.txt +++ b/examples/quick/scenegraph/custommaterial/CMakeLists.txt @@ -1,35 +1,27 @@ -# Generated from custommaterial.pro. - cmake_minimum_required(VERSION 3.16) -project(custommaterial_declarative LANGUAGES CXX) # special case - -set(CMAKE_INCLUDE_CURRENT_DIR ON) +project(custommaterial_declarative LANGUAGES CXX) 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}/quick/scenegraph/custommaterial") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS ShaderTools) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick ShaderTools) -qt_add_executable(custommaterial_declarative # special case +qt_add_executable(custommaterial_declarative customitem.cpp customitem.h main.cpp ) + set_target_properties(custommaterial_declarative PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(custommaterial_declarative PUBLIC # special case + +target_link_libraries(custommaterial_declarative PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -56,7 +48,7 @@ qt6_add_shaders(custommaterial_declarative "shaders" "shaders/mandelbrot.frag" ) -install(TARGETS custommaterial_declarative # special case +install(TARGETS custommaterial_declarative RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" |