summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-04-02 15:56:37 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2020-04-03 08:15:55 +0300
commitaf6f3cb31772fcc05d3e1e55c72210390d4df4e6 (patch)
tree8a276c25ef9c9b1a97ac7d3cdf17f39d0b073ea2 /cmake
parent7e9481f1fb00bee9d20e8c13d761c0f16ee04973 (diff)
qt_record_extra_package_dependency: check that target exists
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>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake16
1 files changed, 9 insertions, 7 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 80dc5f02fa..dfe88d7da4 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2188,14 +2188,16 @@ endfunction()
# main_target_name = qtwaylandscanner
# dep_package_name = WaylandScanner
function(qt_record_extra_package_dependency main_target_name dep_package_name dep_package_version)
- get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
- if(NOT extra_packages)
- set(extra_packages "")
- endif()
+ if (TARGET "${main_target_name}")
+ get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
+ if(NOT extra_packages)
+ set(extra_packages "")
+ endif()
- list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
- set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
- "${extra_packages}")
+ list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
+ set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
+ "${extra_packages}")
+ endif()
endfunction()
# This function records a dependency between ${main_target_name} and ${dep_target_name}