From 9d96c8da78125531c64916291e03867e752a97af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 7 May 2019 20:20:39 +0200 Subject: 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 Reviewed-by: Tobias Hunger --- src/plugins/platforms/minimal/CMakeLists.txt | 4 ++-- src/plugins/platforms/xcb/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 203a9e3920..58cd506e96 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -1,4 +1,4 @@ -qt_find_package(Freetype) # special case +qt_find_package(WrapFreetype) # special case ##################################################################### ## qminimal Plugin: @@ -29,7 +29,7 @@ add_qt_plugin(qminimal extend_target(qminimal CONDITION QT_FEATURE_freetype LIBRARIES - Freetype::Freetype + WrapFreetype::WrapFreetype ) #### Keys ignored in scope 3:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: 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: -- cgit v1.2.3