From f6012c4a56b311978d6f6c421f8a4f7dfa851ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 16 Oct 2020 12:42:46 +0200 Subject: cmake: Fix logic for adding staticlib to module pri Change-Id: I2426e78bb509a37e7e3924506903cd84732f88d8 Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 166fae7713..b79f17243e 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -153,13 +153,9 @@ function(qt_generate_module_pri_file target) endforeach() set(module_internal_config v2) - if(NOT QT_FEATURE_shared) - list(APPEND module_internal_config staticlib) - endif() if(arg_INTERNAL_MODULE) list(APPEND module_internal_config internal_module) endif() - get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") get_target_property(is_fw ${target} FRAMEWORK) @@ -167,6 +163,9 @@ function(qt_generate_module_pri_file target) list(APPEND module_internal_config lib_bundle) endif() endif() + if(target_type STREQUAL "STATIC_LIBRARY") + list(APPEND module_internal_config staticlib) + endif() # TODO: Add the value 'ltcg' to module_internal_config if LTCG is turned on. -- cgit v1.2.3