CMake: Don't create duplicate plugin targets in shared builds
when building Qt repositories. When building for example qtquick3d, the Qt6QmlPlugins.cmake file should not load the qtquick3d specific plugin config files because the targets will be created as part of the build and cause duplicate errors. We already did it for static builds, but now we also do it for shared builds. Amends7d6f1ee5a7
Amends98e8180e56
Pick-to: 6.4 Task-number: QTBUG-94066 Change-Id: I66ca71dfa6485eded94c1ecb5eb3b23daf908b39 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
083ff27518
commit
bea66711d8
@ -694,18 +694,16 @@ endif()\n")
|
||||
|
||||
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "${install_prefix_content}")
|
||||
|
||||
if(NOT BUILD_SHARED_LIBS)
|
||||
# The top-level check needs to happen inside QtBuildInternals, because it's possible
|
||||
# to configure a top-level build with a few repos and then configure another repo
|
||||
# using qt-configure-module in a separate build dir, where QT_SUPERBUILD will not
|
||||
# be set anymore.
|
||||
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
|
||||
"
|
||||
# The top-level check needs to happen inside QtBuildInternals, because it's possible
|
||||
# to configure a top-level build with a few repos and then configure another repo
|
||||
# using qt-configure-module in a separate build dir, where QT_SUPERBUILD will not
|
||||
# be set anymore.
|
||||
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
|
||||
"
|
||||
if(DEFINED QT_REPO_MODULE_VERSION AND NOT DEFINED QT_REPO_DEPENDENCIES AND NOT QT_SUPERBUILD)
|
||||
qt_internal_read_repo_dependencies(QT_REPO_DEPENDENCIES \"$\{PROJECT_SOURCE_DIR}\")
|
||||
endif()
|
||||
")
|
||||
endif()
|
||||
|
||||
if(DEFINED OpenGL_GL_PREFERENCE)
|
||||
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
|
||||
|
Loading…
Reference in New Issue
Block a user