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/webenginequick/recipebrowser/CMakeLists.txt | |
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/webenginequick/recipebrowser/CMakeLists.txt')
-rw-r--r-- | examples/webenginequick/recipebrowser/CMakeLists.txt | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/examples/webenginequick/recipebrowser/CMakeLists.txt b/examples/webenginequick/recipebrowser/CMakeLists.txt index 9643234e7..57a73b4aa 100644 --- a/examples/webenginequick/recipebrowser/CMakeLists.txt +++ b/examples/webenginequick/recipebrowser/CMakeLists.txt @@ -1,32 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(recipebrowser 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}/webenginequick/recipebrowser") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS QuickControls2) -find_package(Qt6 COMPONENTS WebEngineQuick) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick QuickControls2 WebEngineQuick) qt_add_executable(recipebrowser main.cpp ) + set_target_properties(recipebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(recipebrowser PUBLIC Qt::Core Qt::Gui @@ -36,68 +29,87 @@ target_link_libraries(recipebrowser PUBLIC Qt::WebEngineQuick ) - # Resources: set_source_files_properties("resources/pages/assets/3rdparty/markdown.css" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/3rdparty/marked.js" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/custom.css" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/assets/custom.js" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/burger.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/cupcakes.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/burger.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/cupcakes.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/pasta.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/pizza.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/skewers.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/soup.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/images/steak.jpg" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/pasta.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/pizza.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/skewers.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/soup.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/pages/steak.html" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/qml/RecipeList.qml" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set_source_files_properties("resources/qml/main.qml" PROPERTIES QT_SKIP_QUICKCOMPILER 1 ) + set(resources_resource_files "resources/pages/assets/3rdparty/markdown.css" "resources/pages/assets/3rdparty/marked.js" |