diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:33:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-19 14:47:36 +0000 |
| commit | a1ba96ab54c7e0bc3ffc956d49cbd9eadb1ba79f (patch) | |
| tree | 80243448f08833b321e27be3e7b576f9154d59de /examples/help/contextsensitivehelp | |
| parent | f5d54ece60fdc38e3e4b9a380f164ba872112f80 (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,
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
Change-Id: If8bf84b498189fa681cfe5128bc8566026dabec0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 1b640ab2aa150adfc04ad378cd1aadce7054a56a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/help/contextsensitivehelp')
| -rw-r--r-- | examples/help/contextsensitivehelp/CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/examples/help/contextsensitivehelp/CMakeLists.txt b/examples/help/contextsensitivehelp/CMakeLists.txt index f1b8808f0..1eebae222 100644 --- a/examples/help/contextsensitivehelp/CMakeLists.txt +++ b/examples/help/contextsensitivehelp/CMakeLists.txt @@ -1,34 +1,30 @@ -# Generated from contextsensitivehelp.pro. - cmake_minimum_required(VERSION 3.16) project(contextsensitivehelp 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}/help/contextsensitivehelp") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Help) -find_package(Qt6 COMPONENTS Widgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Help Widgets) qt_add_executable(contextsensitivehelp helpbrowser.cpp helpbrowser.h main.cpp wateringconfigdialog.cpp wateringconfigdialog.h wateringconfigdialog.ui ) + set_target_properties(contextsensitivehelp PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(contextsensitivehelp PUBLIC Qt::Core Qt::Gui |