From d686d241d273576e7ac2fc55caaad1d3ea550f13 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 6 Mar 2023 16:00:47 +0100 Subject: [PATCH] Build: Avoid installation of huge static QmlDesignerCore library It is not used as a public interface, just to share with tests. Do not install it. Fixes: QTCREATORBUG-28673 Change-Id: I669ffd468291b8150568d0193a33e5795d58f017 Reviewed-by: Reviewed-by: Marco Bubke Reviewed-by: Qt CI Bot --- cmake/QtCreatorAPI.cmake | 4 ++-- src/plugins/qmldesigner/CMakeLists.txt | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index fb843f29280..10df11100a1 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -122,7 +122,7 @@ function(get_default_defines varName allow_ascii_casts) endfunction() function(add_qtc_library name) - cmake_parse_arguments(_arg "STATIC;OBJECT;SHARED;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;FEATURE_INFO;SKIP_PCH" + cmake_parse_arguments(_arg "STATIC;OBJECT;SHARED;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;FEATURE_INFO;SKIP_PCH;EXCLUDE_FROM_INSTALL" "DESTINATION;COMPONENT;SOURCES_PREFIX;BUILD_DEFAULT" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN} ) @@ -272,7 +272,7 @@ function(add_qtc_library name) set(COMPONENT_OPTION "COMPONENT" "${_arg_COMPONENT}") endif() - if (NOT QTC_STATIC_BUILD OR _arg_SHARED) + if (NOT _arg_EXCLUDE_FROM_INSTALL AND (NOT QTC_STATIC_BUILD OR _arg_SHARED)) install(TARGETS ${name} EXPORT QtCreator RUNTIME diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 0c9992efe29..03db5b27ca5 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -43,6 +43,7 @@ add_qtc_library(QmlDesignerUtils STATIC ) add_qtc_library(QmlDesignerCore STATIC + EXCLUDE_FROM_INSTALL DEPENDS Threads::Threads Qt::CorePrivate @@ -431,7 +432,12 @@ extend_qtc_plugin(QmlDesigner ${CMAKE_CURRENT_LIST_DIR}/components/texteditor PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR} + ${CMAKE_CURRENT_LIST_DIR}/designercore + ${CMAKE_CURRENT_LIST_DIR}/designercore/include PUBLIC_DEPENDS + QmlDesignerUtils + QmlPuppetCommunication + DEPENDS QmlDesignerCore SOURCES designmodecontext.cpp designmodecontext.h