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

Merge "Fix build of QTuioTouchPlugin with Makefile generator on macOS"

Browse Source
This commit is contained in:
Joerg Bornemann 2021-03-11 11:19:48 +01:00 committed by Qt CI Bot
commit 3d71f1733d
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

@ -82,8 +82,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()
if (ANDROID) if (ANDROID)