From aa1690ec7bd6fdc7c7dcc4e5dd65c8a60afa4f12 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 19 Dec 2022 16:15:26 +0100 Subject: [PATCH] qml2puppet: allow Qt Creator build without QtQuick Only require the full dependencies for a standalone build of qml2puppet. Change-Id: I2a158b36fa674db6d655b753afe205f419c0a113 Reviewed-by: Alessandro Portale Reviewed-by: Tim Jenssen Reviewed-by: Marco Bubke --- src/tools/qml2puppet/CMakeLists.txt | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt index 270f1ca58c2..88da74ea363 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt @@ -1,35 +1,35 @@ cmake_minimum_required(VERSION 3.16) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake") - - -project(qml2puppet) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) - if (NOT QT_CREATOR_API_DEFINED) # standalone build + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake") + + project(qml2puppet) + + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) + set(CMAKE_AUTOUIC ON) + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + set(DESTINATION DESTINATION .) include(QtCreatorIDEBranding) include(QtCreatorAPI) + + find_package(Qt5 + COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml Core5Compat + REQUIRED + ) endif() -find_package(Qt5 - COMPONENTS Concurrent Core Gui Network PrintSupport Qml Quick Sql Widgets Xml Core5Compat - REQUIRED -) - if (NOT TARGET QmlPuppetCommunication) -include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake) + include(../../libs/qmlpuppetcommunication/QmlPuppetCommunication.cmake) endif() add_qtc_executable(qml2puppet ${DESTINATION} + CONDITION TARGET Qt5::Quick DEPENDS Qt5::CorePrivate Qt5::Widgets Qt5::QmlPrivate Qt5::QuickPrivate Qt5::Network Qt5::GuiPrivate