From af8c62bc4a908f416dd92a49b6e0617e687c6dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 19:48:21 +0100 Subject: Improve examples CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 Reviewed-by: Jörg Bornemann --- .../webenginewidgets/contentmanipulation/CMakeLists.txt | 13 ++++--------- examples/webenginewidgets/cookiebrowser/CMakeLists.txt | 12 ++++-------- examples/webenginewidgets/html2pdf/CMakeLists.txt | 12 ++++-------- examples/webenginewidgets/maps/CMakeLists.txt | 12 ++++-------- examples/webenginewidgets/markdowneditor/CMakeLists.txt | 13 ++++--------- examples/webenginewidgets/minimal/CMakeLists.txt | 12 ++++-------- examples/webenginewidgets/notifications/CMakeLists.txt | 13 ++++--------- examples/webenginewidgets/printme/CMakeLists.txt | 14 ++++---------- examples/webenginewidgets/simplebrowser/CMakeLists.txt | 13 +++++-------- examples/webenginewidgets/spellchecker/CMakeLists.txt | 14 ++++---------- examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt | 12 ++++-------- examples/webenginewidgets/videoplayer/CMakeLists.txt | 13 ++++--------- examples/webenginewidgets/webui/CMakeLists.txt | 13 ++++--------- 13 files changed, 53 insertions(+), 113 deletions(-) (limited to 'examples/webenginewidgets') diff --git a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt index ae93a7a7e..b53274507 100644 --- a/examples/webenginewidgets/contentmanipulation/CMakeLists.txt +++ b/examples/webenginewidgets/contentmanipulation/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(contentmanipulation 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/contentmanipulation") -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(contentmanipulation main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(contentmanipulation PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(contentmanipulation PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(jquery_resource_files "jquery.min.js" diff --git a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt index e94ecae7a..c5c6b41d3 100644 --- a/examples/webenginewidgets/cookiebrowser/CMakeLists.txt +++ b/examples/webenginewidgets/cookiebrowser/CMakeLists.txt @@ -1,21 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(cookiebrowser 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/cookiebrowser") -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(cookiebrowser cookiedialog.ui @@ -23,17 +18,18 @@ qt_add_executable(cookiebrowser main.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) + set_target_properties(cookiebrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(cookiebrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(cookiebrowser_resource_files "3rdparty/view-refresh.png" diff --git a/examples/webenginewidgets/html2pdf/CMakeLists.txt b/examples/webenginewidgets/html2pdf/CMakeLists.txt index 80567e88f..7e3758d1a 100644 --- a/examples/webenginewidgets/html2pdf/CMakeLists.txt +++ b/examples/webenginewidgets/html2pdf/CMakeLists.txt @@ -1,29 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(html2pdf 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/html2pdf") -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(html2pdf html2pdf.cpp ) + set_target_properties(html2pdf PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(html2pdf PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/maps/CMakeLists.txt b/examples/webenginewidgets/maps/CMakeLists.txt index 01eb96e70..62eb04e42 100644 --- a/examples/webenginewidgets/maps/CMakeLists.txt +++ b/examples/webenginewidgets/maps/CMakeLists.txt @@ -1,30 +1,26 @@ cmake_minimum_required(VERSION 3.16) project(maps 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/maps") -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(maps main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(maps PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(maps PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/markdowneditor/CMakeLists.txt b/examples/webenginewidgets/markdowneditor/CMakeLists.txt index 3852b93d4..c1a0974a0 100644 --- a/examples/webenginewidgets/markdowneditor/CMakeLists.txt +++ b/examples/webenginewidgets/markdowneditor/CMakeLists.txt @@ -1,22 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(markdowneditor 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/markdowneditor") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) -find_package(Qt6 COMPONENTS WebChannel) +find_package(Qt6 REQUIRED COMPONENTS Core Gui WebChannel WebEngineWidgets) qt_add_executable(markdowneditor document.cpp document.h @@ -24,10 +18,12 @@ qt_add_executable(markdowneditor mainwindow.cpp mainwindow.h mainwindow.ui previewpage.cpp previewpage.h ) + set_target_properties(markdowneditor PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(markdowneditor PUBLIC Qt::Core Qt::Gui @@ -35,7 +31,6 @@ target_link_libraries(markdowneditor PUBLIC Qt::WebEngineWidgets ) - # Resources: set(markdowneditor_resource_files "resources/3rdparty/markdown.css" diff --git a/examples/webenginewidgets/minimal/CMakeLists.txt b/examples/webenginewidgets/minimal/CMakeLists.txt index 6c8c44e98..7c1cac1d8 100644 --- a/examples/webenginewidgets/minimal/CMakeLists.txt +++ b/examples/webenginewidgets/minimal/CMakeLists.txt @@ -1,29 +1,25 @@ cmake_minimum_required(VERSION 3.16) project(minimal 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/minimal-widgets") -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(minimal-widgets main.cpp ) + set_target_properties(minimal-widgets PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(minimal-widgets PUBLIC Qt::Core Qt::Gui diff --git a/examples/webenginewidgets/notifications/CMakeLists.txt b/examples/webenginewidgets/notifications/CMakeLists.txt index 6e152cf6c..17d4f343b 100644 --- a/examples/webenginewidgets/notifications/CMakeLists.txt +++ b/examples/webenginewidgets/notifications/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(notifications 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/notifications") -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(notifications main.cpp notificationpopup.h ) + set_target_properties(notifications PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(notifications PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(data_resource_files "data/icon.png" diff --git a/examples/webenginewidgets/printme/CMakeLists.txt b/examples/webenginewidgets/printme/CMakeLists.txt index ada0bf250..2c38103c1 100644 --- a/examples/webenginewidgets/printme/CMakeLists.txt +++ b/examples/webenginewidgets/printme/CMakeLists.txt @@ -1,31 +1,26 @@ cmake_minimum_required(VERSION 3.16) project(printme 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/printme") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WebEngineWidgets) -find_package(Qt6 COMPONENTS PrintSupport) +find_package(Qt6 REQUIRED COMPONENTS Core Gui PrintSupport WebEngineWidgets) qt_add_executable(printme main.cpp printhandler.cpp printhandler.h ) + set_target_properties(printme PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(printme PUBLIC Qt::Core Qt::Gui @@ -33,7 +28,6 @@ target_link_libraries(printme PUBLIC Qt::WebEngineWidgets ) - # Resources: set(data_resource_files "data/icon.svg" 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" diff --git a/examples/webenginewidgets/spellchecker/CMakeLists.txt b/examples/webenginewidgets/spellchecker/CMakeLists.txt index 1a0c76b06..d76881c65 100644 --- a/examples/webenginewidgets/spellchecker/CMakeLists.txt +++ b/examples/webenginewidgets/spellchecker/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(spellchecker 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/spellchecker") -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(spellchecker main.cpp webview.cpp webview.h ) + set_target_properties(spellchecker PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(spellchecker PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(spellchecker_resource_files "data/icon.svg" @@ -66,4 +61,3 @@ foreach(dictFile ${dicts}) OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) endforeach() - diff --git a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt index e0a1723f1..55bd6715e 100644 --- a/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt +++ b/examples/webenginewidgets/stylesheetbrowser/CMakeLists.txt @@ -1,38 +1,34 @@ cmake_minimum_required(VERSION 3.16) project(stylesheetbrowser 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/stylesheetbrowser") -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(stylesheetbrowser main.cpp mainwindow.cpp mainwindow.h mainwindow.ui stylesheetdialog.cpp stylesheetdialog.h stylesheetdialog.ui ) + set_target_properties(stylesheetbrowser PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(stylesheetbrowser PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(stylesheetbrowser_resource_files "3rdparty/view-refresh.png" diff --git a/examples/webenginewidgets/videoplayer/CMakeLists.txt b/examples/webenginewidgets/videoplayer/CMakeLists.txt index 61f4e40c6..4e3e3cc2c 100644 --- a/examples/webenginewidgets/videoplayer/CMakeLists.txt +++ b/examples/webenginewidgets/videoplayer/CMakeLists.txt @@ -1,21 +1,15 @@ cmake_minimum_required(VERSION 3.16) project(videoplayer 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/videoplayer") -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(videoplayer fullscreennotification.cpp fullscreennotification.h @@ -23,17 +17,18 @@ qt_add_executable(videoplayer main.cpp mainwindow.cpp mainwindow.h ) + set_target_properties(videoplayer PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(videoplayer PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(videoplayer_resource_files "data/index.html" diff --git a/examples/webenginewidgets/webui/CMakeLists.txt b/examples/webenginewidgets/webui/CMakeLists.txt index 4d8123e1f..e736a2cde 100644 --- a/examples/webenginewidgets/webui/CMakeLists.txt +++ b/examples/webenginewidgets/webui/CMakeLists.txt @@ -1,37 +1,32 @@ cmake_minimum_required(VERSION 3.16) project(webui 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/webui") -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(webui main.cpp webuihandler.cpp webuihandler.h ) + set_target_properties(webui PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(webui PUBLIC Qt::Core Qt::Gui Qt::WebEngineWidgets ) - # Resources: set(webui_resource_files "about.html" -- cgit v1.2.3