From 7364adf4725a044819ab50ce55f82ad522f9c442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 19:27:10 +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: I024f0c99756c2583a867022b8478f06e088a39af Reviewed-by: Jörg Bornemann --- examples/serialport/terminal/CMakeLists.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'examples/serialport/terminal/CMakeLists.txt') diff --git a/examples/serialport/terminal/CMakeLists.txt b/examples/serialport/terminal/CMakeLists.txt index 0a8c0532..d3a37397 100644 --- a/examples/serialport/terminal/CMakeLists.txt +++ b/examples/serialport/terminal/CMakeLists.txt @@ -1,22 +1,16 @@ cmake_minimum_required(VERSION 3.16) project(terminal 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}/serialport/terminal") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS SerialPort) +find_package(Qt6 REQUIRED COMPONENTS Core Gui SerialPort Widgets) qt_add_executable(terminal console.cpp console.h @@ -24,10 +18,12 @@ qt_add_executable(terminal mainwindow.cpp mainwindow.h mainwindow.ui settingsdialog.cpp settingsdialog.h settingsdialog.ui ) + set_target_properties(terminal PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) + target_link_libraries(terminal PRIVATE Qt::Core Qt::Gui @@ -35,7 +31,6 @@ target_link_libraries(terminal PRIVATE Qt::Widgets ) - # Resources: set(terminal_resource_files "images/application-exit.png" -- cgit v1.2.3