From 1b640ab2aa150adfc04ad378cd1aadce7054a56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 19:33:08 +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 "# 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 Reviewed-by: Jörg Bornemann --- examples/designer/containerextension/CMakeLists.txt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'examples/designer/containerextension/CMakeLists.txt') diff --git a/examples/designer/containerextension/CMakeLists.txt b/examples/designer/containerextension/CMakeLists.txt index efc0e8ef7..f96695c9c 100644 --- a/examples/designer/containerextension/CMakeLists.txt +++ b/examples/designer/containerextension/CMakeLists.txt @@ -1,26 +1,16 @@ -# Generated from containerextension.pro. - cmake_minimum_required(VERSION 3.16) project(containerextension 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}/plugins/designer") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/plugins/designer") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Designer) +find_package(Qt6 REQUIRED COMPONENTS Core Designer Gui Widgets) -# special case begin qt_add_plugin(containerextension) target_sources(containerextension PRIVATE multipagewidget.cpp multipagewidget.h @@ -28,11 +18,12 @@ target_sources(containerextension PRIVATE multipagewidgetextensionfactory.cpp multipagewidgetextensionfactory.h multipagewidgetplugin.cpp multipagewidgetplugin.h ) -# special case end + set_target_properties(containerextension PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(containerextension PUBLIC Qt::Core Qt::Designer -- cgit v1.2.3