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

CMake: Don't rely on versionless commands or targets existing

Browse Source 
Commands like qt6_finalize_executable() should not rely on versionless
commands or targets being available, since they can be disabled by a
build option.

Change-Id: I6a9ab6a9b6a6b731590e5b8c43f73b518ed38e81
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 50f939bfe8bdd63beca4aff06cbf1b2be1677624)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Craig Scott 2020-12-16 12:06:07 +11:00 committed by Qt Cherry-pick Bot
parent 048949e2de
commit 3f2b9af98e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6CoreMacros.cmake
View File

@ -470,15 +470,15 @@ function(_qt_internal_create_executable target)
add_executable("${target}" ${ARGN})
endif()
target_link_libraries("${target}" PRIVATE Qt::Core)
target_link_libraries("${target}" PRIVATE Qt6::Core)
endfunction()
# This function is currently in Technical Preview.
# It's signature and behavior might change.
function(qt6_finalize_executable target)
if(ANDROID)
qt_android_generate_deployment_settings("${target}")
qt_android_add_apk_target("${target}")
qt6_android_generate_deployment_settings("${target}")
qt6_android_add_apk_target("${target}")
endif()
endfunction()