diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-01-20 17:42:48 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-24 23:33:49 +0000 |
| commit | eb8d3d37ef2e5d208f5c456a76738d847e1496b2 (patch) | |
| tree | ce4b65b0b9c91bb325d54ff69e6121111205cbe1 /examples/qmltest | |
| parent | 7d922aec2133d8e9b08bd2ffb10b1721716d451e (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: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 9d82f4bff8520c3f6db7790d9044c3dfc5cc84c0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/qmltest')
| -rw-r--r-- | examples/qmltest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/qmltest/qmltest/CMakeLists.txt | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/examples/qmltest/CMakeLists.txt b/examples/qmltest/CMakeLists.txt index 5de21ce3fc..be5db5fbd1 100644 --- a/examples/qmltest/CMakeLists.txt +++ b/examples/qmltest/CMakeLists.txt @@ -1,3 +1 @@ -# Generated from qmltest.pro. - qt_internal_add_example(qmltest) diff --git a/examples/qmltest/qmltest/CMakeLists.txt b/examples/qmltest/qmltest/CMakeLists.txt index adafbce610..e1c713c9b4 100644 --- a/examples/qmltest/qmltest/CMakeLists.txt +++ b/examples/qmltest/qmltest/CMakeLists.txt @@ -1,43 +1,34 @@ -# Generated from qmltest.pro. - cmake_minimum_required(VERSION 3.16) project(tst_qmltestexample 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}") set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples) -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -#special case begin -find_package(Qt6 COMPONENTS QuickTest) -#special case end +find_package(Qt6 REQUIRED COMPONENTS Core Gui QuickTest) qt_add_executable(tst_qmltestexample tst_qmltest.cpp ) + set_target_properties(tst_qmltestexample PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(tst_qmltestexample PUBLIC Qt::Core Qt::Gui -# special case begin + Qt::QuickTest -# special case end + ) -# special case begin # This line get added, but does not make sense #if(QT_BUILDING_QT) # target_link_libraries(tst_qmltestexample PUBLIC @@ -45,7 +36,6 @@ target_link_libraries(tst_qmltestexample PUBLIC # Qt::QuickTest # ) #endif() -# special case end if(MACOS AND QT_BUILDING_QT) set_target_properties(tst_qmltestexample PROPERTIES |