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

qt_record_extra_package_dependency: check that target exists

Browse Source 
The target may not be defined which causes error:
get_target_property() called with non-existent target "qtwaylandscanner".

Change-Id: I58a9122456ccbbbb8fc9f0adce3b7ddcc985e6a4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Samuli Piippo 2020-04-02 15:56:37 +03:00
parent 7e9481f1fb
commit af6f3cb317
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuild.cmake
View File

@ -2188,6 +2188,7 @@ endfunction()
# main_target_name = qtwaylandscanner # main_target_name = qtwaylandscanner
# dep_package_name = WaylandScanner # dep_package_name = WaylandScanner
function(qt_record_extra_package_dependency main_target_name dep_package_name dep_package_version) function(qt_record_extra_package_dependency main_target_name dep_package_name dep_package_version)
if (TARGET "${main_target_name}")
get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES) get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
if(NOT extra_packages) if(NOT extra_packages)
set(extra_packages "") set(extra_packages "")
@ -2196,6 +2197,7 @@ function(qt_record_extra_package_dependency main_target_name dep_package_name de
list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}") list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
"${extra_packages}") "${extra_packages}")
endif()
endfunction() endfunction()
# This function records a dependency between ${main_target_name} and ${dep_target_name} # This function records a dependency between ${main_target_name} and ${dep_target_name}