diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-02-14 19:48:21 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-02-25 10:41:12 +0100 |
| commit | af8c62bc4a908f416dd92a49b6e0617e687c6dd7 (patch) | |
| tree | 7fa02d56c5e6bca88e3b81008187ac13530003e6 /examples/webenginewidgets/simplebrowser | |
| parent | 170fc1c2cb43318817552f1a1bed42b5cdc6eb36 (diff) | |
Improve examples CMakeLists.txt
- Remove "# generated from xyz.pro" comment from 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: I09083474432ce171e8ee1e28120b062f2ef3c052
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/webenginewidgets/simplebrowser')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/examples/webenginewidgets/simplebrowser/CMakeLists.txt b/examples/webenginewidgets/simplebrowser/CMakeLists.txt index ee11c02d1..f23bce709 100644 --- a/examples/webenginewidgets/simplebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/simplebrowser/CMakeLists.txt @@ -1,21 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(simplebrowser 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}/webenginewidgets/simplebrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebEngineWidgets) qt_add_executable(simplebrowser browser.cpp browser.h @@ -30,17 +25,18 @@ qt_add_executable(simplebrowser webpopupwindow.cpp webpopupwindow.h webview.cpp webview.h ) + set_target_properties(simplebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(simplebrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(simplebrowser_resource_files "data/AppLogoColor.png" @@ -55,6 +51,7 @@ qt_add_resources(simplebrowser "simplebrowser" FILES ${simplebrowser_resource_files} ) + set(simplebrowser1_resource_files "data/3rdparty/dialog-error.png" "data/3rdparty/edit-clear.png" |