From 6dd1b66517aa60bdfd87aa7e3a071f5031f1c15f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 26 May 2021 11:27:11 +0200 Subject: [PATCH] CMake: Don't apply invalid infixes to INTERFACE libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And object libraries. Setting properties like IMPORT_SUFFIX on them doesn't make sense and can cause configuration issues. Amends 1bd408d6f7eac7908c77a0129e0173c280fce55b Change-Id: Ie91d1fbc7ba130816854d50c5b00ef793e4bad1f Reviewed-by: Martin Storsjö Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/corelib/Qt6CoreMacros.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index d4e8d948b1..bbe07a93ff 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1877,7 +1877,9 @@ function(_qt_internal_add_library target) add_library(${target} ${type_to_create} ${arg_UNPARSED_ARGUMENTS}) - _qt_internal_apply_win_prefix_and_suffix("${target}") + if(NOT type_to_create STREQUAL "INTERFACE" AND NOT type_to_create STREQUAL "OBJECT") + _qt_internal_apply_win_prefix_and_suffix("${target}") + endif() if(arg_MODULE AND APPLE) # CMake defaults to using .so extensions for loadable modules, aka plugins,