diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:33:08 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-19 08:56:49 +0100 |
commit | 1b640ab2aa150adfc04ad378cd1aadce7054a56a (patch) | |
tree | c95637c448cd1975876c29389c018265a5984d97 /examples/linguist | |
parent | bf18e7956ddb0f99f0358f67cfe043553babbdad (diff) | |
download | qttools-1b640ab2aa150adfc04ad378cd1aadce7054a56a.tar.gz |
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,
when unnecessary
- 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: If8bf84b498189fa681cfe5128bc8566026dabec0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/linguist')
-rw-r--r-- | examples/linguist/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/linguist/arrowpad/CMakeLists.txt | 15 | ||||
-rw-r--r-- | examples/linguist/hellotr/CMakeLists.txt | 15 | ||||
-rw-r--r-- | examples/linguist/trollprint/CMakeLists.txt | 15 |
4 files changed, 15 insertions, 32 deletions
diff --git a/examples/linguist/CMakeLists.txt b/examples/linguist/CMakeLists.txt index 87865fb3a..433323c23 100644 --- a/examples/linguist/CMakeLists.txt +++ b/examples/linguist/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from linguist.pro. - qt_internal_add_example(arrowpad) qt_internal_add_example(hellotr) qt_internal_add_example(trollprint) diff --git a/examples/linguist/arrowpad/CMakeLists.txt b/examples/linguist/arrowpad/CMakeLists.txt index 882136b95..1c9ced988 100644 --- a/examples/linguist/arrowpad/CMakeLists.txt +++ b/examples/linguist/arrowpad/CMakeLists.txt @@ -1,23 +1,16 @@ -# Generated from arrowpad.pro. - cmake_minimum_required(VERSION 3.16) project(arrowpad 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}/linguist/arrowpad") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + #! [0] find_package(Qt6 REQUIRED COMPONENTS LinguistTools) #! [0] @@ -27,6 +20,7 @@ qt_add_executable(arrowpad main.cpp mainwindow.cpp mainwindow.h ) + #! [1] qt6_add_translations(arrowpad TS_FILES arrowpad_fr.ts arrowpad_nl.ts @@ -37,6 +31,7 @@ set_target_properties(arrowpad PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(arrowpad PUBLIC Qt::Core Qt::Gui diff --git a/examples/linguist/hellotr/CMakeLists.txt b/examples/linguist/hellotr/CMakeLists.txt index 9f9fb085d..eee4edadd 100644 --- a/examples/linguist/hellotr/CMakeLists.txt +++ b/examples/linguist/hellotr/CMakeLists.txt @@ -1,23 +1,16 @@ -# Generated from hellotr.pro. - cmake_minimum_required(VERSION 3.16) project(hellotr 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}/linguist/hellotr") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + #! [0] find_package(Qt6 REQUIRED COMPONENTS LinguistTools) #! [0] @@ -25,6 +18,7 @@ find_package(Qt6 REQUIRED COMPONENTS LinguistTools) qt_add_executable(hellotr main.cpp ) + #! [1] qt6_add_translations(hellotr TS_FILES hellotr_la.ts @@ -35,6 +29,7 @@ set_target_properties(hellotr PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(hellotr PUBLIC Qt::Core Qt::Gui diff --git a/examples/linguist/trollprint/CMakeLists.txt b/examples/linguist/trollprint/CMakeLists.txt index 42d26a75d..48119eeb2 100644 --- a/examples/linguist/trollprint/CMakeLists.txt +++ b/examples/linguist/trollprint/CMakeLists.txt @@ -1,23 +1,16 @@ -# Generated from trollprint.pro. - cmake_minimum_required(VERSION 3.16) project(trollprint 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}/linguist/trollprint") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + find_package(Qt6 REQUIRED COMPONENTS LinguistTools) qt_add_executable(trollprint @@ -25,6 +18,7 @@ qt_add_executable(trollprint mainwindow.cpp mainwindow.h printpanel.cpp printpanel.h ) + qt6_add_translations(trollprint TS_FILES trollprint_pt.ts QM_FILES_OUTPUT_VARIABLE qm_files) @@ -34,6 +28,7 @@ set_target_properties(trollprint PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(trollprint PUBLIC Qt::Core Qt::Gui |