diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 09:37:03 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-14 15:03:14 +0200 |
| commit | 6718dea390d3bf1a463e589dbf2a605a1886bb14 (patch) | |
| tree | ba934715b903008eeb52eb188022536091db1aa7 /cmake/QtPostProcessHelpers.cmake | |
| parent | b96d350cff150cde6925c4e9a5e4d235ad8a7737 (diff) | |
Revert "Revert "CMake: Add facility to mark package dependencies as optional""
This reverts commit b0c51f86f40b6b6d18fe2bb75cc851d36395240d.
The build failure caused by 58c1c6ee5c986d502b56eb1cc57f1d9444d42031 has
been fixed.
Change-Id: Ic7458d54c7a874588e8b1bfeca61df1842763656
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtPostProcessHelpers.cmake')
| -rw-r--r-- | cmake/QtPostProcessHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 0da6d9e4c3..56b2d5e56f 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -43,6 +43,7 @@ macro(qt_collect_third_party_deps target) get_target_property(package_name ${dep} INTERFACE_QT_PACKAGE_NAME) if(dep_seen EQUAL -1 AND package_name) list(APPEND third_party_deps_seen ${dep}) + get_target_property(package_is_optional ${dep} INTERFACE_QT_PACKAGE_IS_OPTIONAL) get_target_property(package_version ${dep} INTERFACE_QT_PACKAGE_VERSION) if(NOT package_version) set(package_version "") @@ -54,7 +55,7 @@ macro(qt_collect_third_party_deps target) endif() list(APPEND third_party_deps - "${package_name}\;${package_version}\;${package_components}") + "${package_name}\;${package_is_optional}\;${package_version}\;${package_components}") endif() endif() endforeach() |