1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build of QTuioTouchPlugin with Makefile generator on macOS

Browse Source 
For each plugin, we create a custom target with it's OUTPUT_NAME such
that one simply can do 'ninja qtuiotouchplugin' to build it.

QTuiTouchPlugin has qtuiotouchplugin as OUTPUT_NAME, which is
problematic with Makefile generators on case-insensitive file systems.
See CMake upstream issue #21915 for details.

Work around this issue by not creating the custom target in this
situation.

Fixes: QTBUG-84342
Change-Id: Id9a6cf0a01c179d5c93da4146e393cf00153ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 82d50925f1a7d4ff852e5302fd9e8a3ae18763d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2021-03-11 11:19:48 +01:00 committed by Qt Cherry-pick Bot
parent f426246474
commit 1a1d981b56
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtPluginHelpers.cmake
View File

@ -107,8 +107,14 @@ function(qt_internal_add_plugin target)
# Add a custom target with the Qt5 qmake name for a more user friendly ninja experience. # Add a custom target with the Qt5 qmake name for a more user friendly ninja experience.
if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}") if(arg_OUTPUT_NAME AND NOT TARGET "${output_name}")
add_custom_target("${output_name}") # But don't create such a target if it would just differ in case from "${target}"
add_dependencies("${output_name}" "${target}") # and we're not using Ninja. See https://gitlab.kitware.com/cmake/cmake/-/issues/21915
string(TOUPPER "${output_name}" uc_output_name)
string(TOUPPER "${target}" uc_target)
if(NOT uc_output_name STREQUAL uc_target OR CMAKE_GENERATOR MATCHES "^Ninja")
add_custom_target("${output_name}")
add_dependencies("${output_name}" "${target}")
endif()
endif() endif()
qt_internal_add_target_aliases("${target}") qt_internal_add_target_aliases("${target}")