summaryrefslogtreecommitdiffstats
path: root/util/cmake/helper.py
diff options
context:
space:
mode:
authorJoerg Bornemann <[email protected]>2022-03-03 12:04:48 +0100
committerJoerg Bornemann <[email protected]>2022-03-08 03:45:29 +0100
commit1c2f6d2aceeb218786fde0ee0cb2ffd207d1e0b1 (patch)
tree9861350f85637412bb114407eb319c4a383944ad /util/cmake/helper.py
parentf5a8d70deedb4bb2270be1f1ded9ddd3c4071d41 (diff)
pro2cmake: Write only one find_package call for Qt packages
Task-number: QTBUG-96799 Change-Id: I1eb8ac05f360b74e5ae1217b5535a33227b5084b Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'util/cmake/helper.py')
-rw-r--r--util/cmake/helper.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py
index 900975de363..0a363eb4d35 100644
--- a/util/cmake/helper.py
+++ b/util/cmake/helper.py
@@ -786,6 +786,7 @@ def generate_find_package_info(
indent: int = 0,
emit_if: str = "",
use_system_package_name: bool = False,
+ remove_REQUIRED_from_extra: bool = True,
module: str = "",
) -> str:
isRequired = False
@@ -797,7 +798,8 @@ def generate_find_package_info(
if "REQUIRED" in extra and use_qt_find_package:
isRequired = True
- extra.remove("REQUIRED")
+ if remove_REQUIRED_from_extra:
+ extra.remove("REQUIRED")
cmake_target_name = lib.targetName
assert cmake_target_name