diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-04 18:46:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-05 11:19:21 +0000 |
| commit | 714199b60f4fecfdf16b5e34fd6fa034e2cd9924 (patch) | |
| tree | a3e7d0edf2e3e8b57fd88b8ab107df4c79afc2e7 | |
| parent | 370888afa482deb8a349a1337cc46dc9cb199d24 (diff) | |
CMake: Fix static package dependencies for vkb plugins
The 3rdpaty bundled libraries need to be prefixed with Qt::
so that the dependencies are written into the
QtFooPluginDependencies.cmake file and thus correctly found when using
a static Qt in an application project.
Fixes: QTBUG-97983
Change-Id: I6dc89fe82168d9eb5a9fc4f284a085203d5e39c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 5d9532a688c0ddaff8e0be24959b6f6baefaade3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/cerence/xt9/plugin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/cerence/xt9/xt9common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/openwnn/plugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/pinyin/plugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/tcime/plugin/CMakeLists.txt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt b/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt index c4da7e62..0dc94935 100644 --- a/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt +++ b/src/plugins/cerence/cerence-hwr/plugin/CMakeLists.txt @@ -22,7 +22,7 @@ qt_internal_add_plugin(QtVirtualKeyboardCerenceHwrPlugin QT_NO_CAST_FROM_BYTEARRAY QT_NO_CAST_TO_ASCII LIBRARIES - BundledCerencecommon + Qt::BundledCerencecommon PUBLIC_LIBRARIES Qt::Core Qt::Gui @@ -319,7 +319,7 @@ qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION QT_FEATURE DEFINES HAVE_XT9 LIBRARIES - BundledXt9Common + Qt::BundledXt9Common ) qt_internal_extend_target(QtVirtualKeyboardCerenceHwrPlugin CONDITION QT_FEATURE_cerence_hwr_alphabetic diff --git a/src/plugins/cerence/xt9/plugin/CMakeLists.txt b/src/plugins/cerence/xt9/plugin/CMakeLists.txt index 0fce11c7..23f0b98d 100644 --- a/src/plugins/cerence/xt9/plugin/CMakeLists.txt +++ b/src/plugins/cerence/xt9/plugin/CMakeLists.txt @@ -27,8 +27,8 @@ qt_internal_add_plugin(QtVirtualKeyboardXt9Plugin QT_NO_CAST_FROM_BYTEARRAY QT_NO_CAST_TO_ASCII LIBRARIES - BundledCerencecommon - BundledXt9Common + Qt::BundledCerencecommon + Qt::BundledXt9Common PUBLIC_LIBRARIES Qt::Core Qt::Gui diff --git a/src/plugins/cerence/xt9/xt9common/CMakeLists.txt b/src/plugins/cerence/xt9/xt9common/CMakeLists.txt index d2676bd2..0e670ed0 100644 --- a/src/plugins/cerence/xt9/xt9common/CMakeLists.txt +++ b/src/plugins/cerence/xt9/xt9common/CMakeLists.txt @@ -24,7 +24,7 @@ qt_internal_add_3rdparty_library(BundledXt9Common PUBLIC_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> LIBRARIES - BundledCerencecommon + Qt::BundledCerencecommon PUBLIC_LIBRARIES Qt::Core Qt::VirtualKeyboard diff --git a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt b/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt index 70ca45fa..988b18cf 100644 --- a/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt +++ b/src/plugins/hunspell/hunspellinputmethod/CMakeLists.txt @@ -37,7 +37,7 @@ qt_internal_extend_target(HunspellInputMethodPrivate CONDITION QT_FEATURE_system # special case begin qt_internal_extend_target(HunspellInputMethodPrivate CONDITION NOT QT_FEATURE_system_hunspell AND QT_FEATURE_3rdparty_hunspell LIBRARIES - BundledHunspell + Qt::BundledHunspell ) # special case end diff --git a/src/plugins/openwnn/plugin/CMakeLists.txt b/src/plugins/openwnn/plugin/CMakeLists.txt index 4d2c6cd6..260cbff4 100644 --- a/src/plugins/openwnn/plugin/CMakeLists.txt +++ b/src/plugins/openwnn/plugin/CMakeLists.txt @@ -20,7 +20,7 @@ qt_internal_add_plugin(QtVirtualKeyboardOpenWnnPlugin Qt::Gui Qt::Qml Qt::VirtualKeyboard - BundledOpenwnn + Qt::BundledOpenwnn ) # Resources: diff --git a/src/plugins/pinyin/plugin/CMakeLists.txt b/src/plugins/pinyin/plugin/CMakeLists.txt index 505c8865..43c7c83e 100644 --- a/src/plugins/pinyin/plugin/CMakeLists.txt +++ b/src/plugins/pinyin/plugin/CMakeLists.txt @@ -21,7 +21,7 @@ qt_internal_add_plugin(QtVirtualKeyboardPinyinPlugin Qt::Gui Qt::Qml Qt::VirtualKeyboard - BundledPinyin + Qt::BundledPinyin ) # Resources: diff --git a/src/plugins/tcime/plugin/CMakeLists.txt b/src/plugins/tcime/plugin/CMakeLists.txt index 72cb4913..ff693a3e 100644 --- a/src/plugins/tcime/plugin/CMakeLists.txt +++ b/src/plugins/tcime/plugin/CMakeLists.txt @@ -20,7 +20,7 @@ qt_internal_add_plugin(QtVirtualKeyboardTCImePlugin Qt::Gui Qt::Qml Qt::VirtualKeyboardPrivate - BundledTcime + Qt::BundledTcime ) # Resources: |