AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix target existence check in qt6_android_generate_deployment_settings

Browse Source 
Move the check to the beginning of the function.

Pick-to: 6.2
Change-Id: Ia44bb2e56626b00e75efabf2ebdc8eb97eee0ff8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
This commit is contained in:
Alexey Edelev 2021-10-27 13:34:46 +02:00
parent d273f38726
commit 53ffa665d0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/Qt6AndroidMacros.cmake
View File

@ -19,6 +19,11 @@ endfunction()
# Generate the deployment settings json file for a cmake target. # Generate the deployment settings json file for a cmake target.
function(qt6_android_generate_deployment_settings target) function(qt6_android_generate_deployment_settings target)
# Information extracted from mkspecs/features/android/android_deployment_settings.prf
if (NOT TARGET ${target})
message(FATAL_ERROR "${target} is not a cmake target")
endif()
# When parsing JSON file format backslashes and follow up symbols are regarded as special # When parsing JSON file format backslashes and follow up symbols are regarded as special
# characters. This puts Windows path format into a trouble. # characters. This puts Windows path format into a trouble.
# _qt_internal_android_format_deployment_paths converts sensitive paths to the CMake format # _qt_internal_android_format_deployment_paths converts sensitive paths to the CMake format
@ -36,12 +41,6 @@ function(qt6_android_generate_deployment_settings target)
_qt_is_android_generate_deployment_settings_called TRUE _qt_is_android_generate_deployment_settings_called TRUE
) )
# Information extracted from mkspecs/features/android/android_deployment_settings.prf
if (NOT TARGET ${target})
message(SEND_ERROR "${target} is not a cmake target")
return()
endif()
get_target_property(target_type ${target} TYPE) get_target_property(target_type ${target} TYPE)
if (NOT "${target_type}" STREQUAL "MODULE_LIBRARY") if (NOT "${target_type}" STREQUAL "MODULE_LIBRARY")