diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-08-09 18:03:50 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2021-08-10 14:31:31 +0200 |
| commit | 5c91b37a5b592c4c062f4386d83653c2170d1c07 (patch) | |
| tree | aa71274be86dff10561d8c7886ba62ab2e81f3ad /src/3rdparty/clip2tri | |
| parent | 3dd6e04c7f4d9304aa22737d5610293adbd5995f (diff) | |
| download | qtlocation-5c91b37a5b592c4c062f4386d83653c2170d1c07.tar.gz | |
Fix static build
This patch fixes the "Bundled_Clip2Tri not found" error during static
QtPositioning build.
Fix backend plugins so that they get automatically linked in static
build.
Fixes: QTBUG-95582
Pick-to: 6.2
Change-Id: Iea31c23a055689d9b8f6471345558b330795f597
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/3rdparty/clip2tri')
| -rw-r--r-- | src/3rdparty/clip2tri/CMakeLists.txt | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/3rdparty/clip2tri/CMakeLists.txt b/src/3rdparty/clip2tri/CMakeLists.txt index 4e84ee71..9b5a56b3 100644 --- a/src/3rdparty/clip2tri/CMakeLists.txt +++ b/src/3rdparty/clip2tri/CMakeLists.txt @@ -15,27 +15,11 @@ qt_internal_add_3rdparty_library(Bundled_Clip2Tri ../clipper ../poly2tri LIBRARIES - # Remove: L/lib - Bundled_Clipper # special case - Bundled_Poly2Tri # special case + Qt::Bundled_Clipper # special case + Qt::Bundled_Poly2Tri # special case ) qt_disable_warnings(Bundled_Clip2Tri) - -# special case begin - -# Generating an alias target, so that the unneeded include dependency is not -# generated in STATIC build. -# Otherwise the Bundled_Clip2Tri target will match to one of the -# ${known_modules}, and will be added to generate a wierd -# #include <QtBundled_Clip2Tri/QtBundled_Clip2Tri> -# in the QtPositioning/QtPositioningDepends. -# The root cause for such behavior are -# function(qt_internal_create_module_depends_file target) -# and -# function(qt_internal_write_depends_file module) -add_library(Clip2Tri::Clip2Tri ALIAS Bundled_Clip2Tri) - -# special case end +qt_set_symbol_visibility_hidden(Bundled_Clip2Tri) ## Scopes: ##################################################################### |