From eee8773406e27c1fb46aafb1f77415d4b033c856 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 7 Dec 2022 16:15:20 +0100 Subject: Make plugins static Remove the project Change-Id: I25bc4e96be6f54f30f87fdab8244f240f0a53646 Reviewed-by: Thomas Hartmann --- CMakeLists.txt | 19 ++++++++++++------- src/imports/application/CMakeLists.txt | 1 + src/imports/components/CMakeLists.txt | 5 +++++ src/imports/effects_qt6/CMakeLists.txt | 6 ++++++ src/imports/flowview/CMakeLists.txt | 2 +- src/imports/logichelper/CMakeLists.txt | 1 + src/imports/multitext/CMakeLists.txt | 1 + src/imports/tools/eventsimulator/CMakeLists.txt | 2 +- src/imports/tools/eventsystem/CMakeLists.txt | 1 + 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f03162..88ff15c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,20 @@ cmake_minimum_required(VERSION 3.16) ##PROJECT_VERSION_MAJOR = 6 -project(QtQuickDesignerComponents - DESCRIPTION "QtQuick Designer Components" - HOMEPAGE_URL "https://qt.io/" - VERSION "6.4.0" - LANGUAGES CXX C -) + +## project(QtQuickDesignerComponents +## DESCRIPTION "QtQuick Designer Components" +## HOMEPAGE_URL "https://qt.io/" +## VERSION "6.4.0" +## LANGUAGES CXX C +##) include(CMakePrintHelpers) +set(PROJECT_VERSION_MAJOR 6) +set(PROJECT_VERSION_MINOR 4) +set(PROJECT_VERSION 6.4.1) + cmake_print_variables(PROJECT_SOURCE_DIR) cmake_print_variables(PROJECT_VERSION_MAJOR) message("$(PROJECT_SOURCE_DIR)") @@ -28,6 +33,6 @@ find_package(Qt6 Gui ) -qt_standard_project_setup() +### qt_standard_project_setup() add_subdirectory(src) diff --git a/src/imports/application/CMakeLists.txt b/src/imports/application/CMakeLists.txt index 8e9b68e..7f3a269 100644 --- a/src/imports/application/CMakeLists.txt +++ b/src/imports/application/CMakeLists.txt @@ -2,6 +2,7 @@ ## QuickStudioApplicationModule: ##################################################################### +qt_add_library(QuickStudioApplication STATIC) qt6_add_qml_module(QuickStudioApplication URI "QtQuick.Studio.Application" VERSION "${PROJECT_VERSION}" diff --git a/src/imports/components/CMakeLists.txt b/src/imports/components/CMakeLists.txt index 7f87f1a..d79e8d4 100644 --- a/src/imports/components/CMakeLists.txt +++ b/src/imports/components/CMakeLists.txt @@ -1,3 +1,4 @@ +qt_add_library(QuickStudioComponents STATIC) qt6_add_qml_module(QuickStudioComponents URI "QtQuick.Studio.Components" VERSION "${PROJECT_VERSION}" @@ -19,4 +20,8 @@ qt6_add_qml_module(QuickStudioComponents StraightArrow.qml ) +set_target_properties(QuickStudioComponents PROPERTIES +QT_QMLCACHEGEN_EXECUTABLE qmlcachegen +) + diff --git a/src/imports/effects_qt6/CMakeLists.txt b/src/imports/effects_qt6/CMakeLists.txt index 9e14d8e..9663c13 100644 --- a/src/imports/effects_qt6/CMakeLists.txt +++ b/src/imports/effects_qt6/CMakeLists.txt @@ -1,3 +1,4 @@ +qt_add_library(QuickStudioEffects STATIC) qt6_add_qml_module(QuickStudioEffects URI "QtQuick.Studio.Effects" VERSION "${PROJECT_VERSION}" @@ -51,4 +52,9 @@ qt6_add_qml_module(QuickStudioEffects ZoomBlurEffect.qml ) +set_target_properties(QuickStudioEffects PROPERTIES +QT_QMLCACHEGEN_EXECUTABLE qmlcachegen +) + + diff --git a/src/imports/flowview/CMakeLists.txt b/src/imports/flowview/CMakeLists.txt index ab076b7..2c28037 100644 --- a/src/imports/flowview/CMakeLists.txt +++ b/src/imports/flowview/CMakeLists.txt @@ -2,7 +2,7 @@ set_source_files_properties(FlowState.qml PROPERTIES QT_QML_SINGLETON_TYPE true ) - +qt_add_library(FlowView STATIC) qt6_add_qml_module(FlowView URI "FlowView" VERSION "${PROJECT_VERSION}" diff --git a/src/imports/logichelper/CMakeLists.txt b/src/imports/logichelper/CMakeLists.txt index b803232..cc06461 100644 --- a/src/imports/logichelper/CMakeLists.txt +++ b/src/imports/logichelper/CMakeLists.txt @@ -1,3 +1,4 @@ +qt_add_library(QuickStudioLogicHelper STATIC) qt6_add_qml_module(QuickStudioLogicHelper URI "QtQuick.Studio.LogicHelper" VERSION "${PROJECT_VERSION}" diff --git a/src/imports/multitext/CMakeLists.txt b/src/imports/multitext/CMakeLists.txt index 7a70daf..ffc9bde 100644 --- a/src/imports/multitext/CMakeLists.txt +++ b/src/imports/multitext/CMakeLists.txt @@ -1,3 +1,4 @@ +qt_add_library(QuickStudioMultiText STATIC) qt6_add_qml_module(QuickStudioMultiText URI "QtQuick.Studio.MultiText" VERSION "${PROJECT_VERSION}" diff --git a/src/imports/tools/eventsimulator/CMakeLists.txt b/src/imports/tools/eventsimulator/CMakeLists.txt index 66718e9..10daa86 100644 --- a/src/imports/tools/eventsimulator/CMakeLists.txt +++ b/src/imports/tools/eventsimulator/CMakeLists.txt @@ -2,7 +2,7 @@ set_source_files_properties(EventSimulator.qml PROPERTIES QT_QML_SINGLETON_TYPE true ) - +qt_add_library(QuickStudioEventSimulator STATIC) qt6_add_qml_module(QuickStudioEventSimulator URI "QtQuick.Studio.EventSimulator" VERSION "${PROJECT_VERSION}" diff --git a/src/imports/tools/eventsystem/CMakeLists.txt b/src/imports/tools/eventsystem/CMakeLists.txt index 34cc22f..eb9202e 100644 --- a/src/imports/tools/eventsystem/CMakeLists.txt +++ b/src/imports/tools/eventsystem/CMakeLists.txt @@ -3,6 +3,7 @@ set_source_files_properties(EventSystem.qml QT_QML_SINGLETON_TYPE true ) +qt_add_library(QuickStudioEventSystem STATIC) qt6_add_qml_module(QuickStudioEventSystem URI "QtQuick.Studio.EventSystem" VERSION "${PROJECT_VERSION}" -- cgit v1.2.3