From 62387ed3c3e169b42d4a07b673fdea2888769de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 14 Feb 2022 19:44:06 +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" comments - 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: I213a18f08c12e5b2354f02be0ec64bc022bfb23c Reviewed-by: Qt CI Bot Reviewed-by: Jörg Bornemann --- examples/webchannel/chatserver-cpp/CMakeLists.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'examples/webchannel/chatserver-cpp') diff --git a/examples/webchannel/chatserver-cpp/CMakeLists.txt b/examples/webchannel/chatserver-cpp/CMakeLists.txt index 501f10f..dfbd8dc 100644 --- a/examples/webchannel/chatserver-cpp/CMakeLists.txt +++ b/examples/webchannel/chatserver-cpp/CMakeLists.txt @@ -1,23 +1,15 @@ -# Generated from chatserver-cpp.pro. - cmake_minimum_required(VERSION 3.16) project(chatserver 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}/webchannel/chatserver-cpp") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS WebSockets) -find_package(Qt6 COMPONENTS WebChannel) +find_package(Qt6 REQUIRED COMPONENTS Core WebChannel WebSockets) qt_add_executable(chatserver ../shared/websocketclientwrapper.cpp ../shared/websocketclientwrapper.h @@ -25,10 +17,12 @@ qt_add_executable(chatserver chatserver.cpp chatserver.h main.cpp ) + set_target_properties(chatserver PROPERTIES WIN32_EXECUTABLE FALSE MACOSX_BUNDLE TRUE ) + target_link_libraries(chatserver PUBLIC Qt::Core Qt::WebChannel -- cgit v1.2.3