summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-05-07 20:20:39 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-05-08 10:54:15 +0000
commit9d96c8da78125531c64916291e03867e752a97af (patch)
tree99a5b4426268c940e42c71b2b65e1fcb80477020 /src/plugins/platforms/xcb
parente8bb67330164e3ed4baf87b4b0a46d584fe3b738 (diff)
Fix freetype target not being found when using vcpkg
vcpkg and upstream CMake find module define different target names for the same package. To circumvent this, create our own Wrap find module, and link against it. Inside the find module, try both target names. Change-Id: Iba488bce0fb410ddb83f6414244f86ad367de72b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r--src/plugins/platforms/xcb/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index c6c0c90b25..77fda139cf 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -6,7 +6,7 @@ qt_find_package(X11)
qt_find_package(XCB)
qt_find_package(XKB)
qt_find_package(PkgConfig)
-qt_find_package(Freetype)
+qt_find_package(WrapFreetype)
qt_find_package(GLIB2)
pkg_check_modules(XKB_COMMON_X11 xkbcommon-x11>=0.4.1 IMPORTED_TARGET) # special case
@@ -165,7 +165,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xre
extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
LIBRARIES
- Freetype::Freetype
+ WrapFreetype::WrapFreetype
)
#####################################################################
## qxcb Plugin: