From e24be7b6c3a85214b64abeff9aa14e1d1cf4640d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 27 Oct 2020 15:01:04 +0100 Subject: [PATCH] cmake: Avoid -NOTFOUND suffix in module pri config Change-Id: I1407a661c482d918dd143f291ee648bc7b18feef Reviewed-by: Alexandru Croitor --- cmake/QtPriHelpers.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index 7760951f443..3601d557354 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -144,7 +144,10 @@ function(qt_generate_module_pri_file target) qt_correct_features(enabled_private_features "${enabled_private_features}") qt_correct_features(disabled_private_features "${disabled_private_features}") - foreach(var enabled_features disabled_features enabled_private_features disabled_private_features) + get_target_property(module_internal_config "${target}" + "${property_prefix}QT_MODULE_INTERNAL_CONFIG") + + foreach(var enabled_features disabled_features enabled_private_features disabled_private_features module_internal_config) if(${var} STREQUAL "${var}-NOTFOUND") set(${var} "") else() @@ -152,7 +155,6 @@ function(qt_generate_module_pri_file target) endif() endforeach() - get_target_property(module_internal_config "${target}" "${property_prefix}QT_MODULE_INTERNAL_CONFIG") list(APPEND module_internal_config v2) if(arg_INTERNAL_MODULE)