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

cmake: Avoid -NOTFOUND suffix in module pri config

Browse Source 
Change-Id: I1407a661c482d918dd143f291ee648bc7b18feef
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-10-27 15:01:04 +01:00
parent 1ce3a89487
commit e24be7b6c3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtPriHelpers.cmake
View File

@ -144,7 +144,10 @@ function(qt_generate_module_pri_file target)
qt_correct_features(enabled_private_features "${enabled_private_features}") qt_correct_features(enabled_private_features "${enabled_private_features}")
qt_correct_features(disabled_private_features "${disabled_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") if(${var} STREQUAL "${var}-NOTFOUND")
set(${var} "") set(${var} "")
else() else()
@ -152,7 +155,6 @@ function(qt_generate_module_pri_file target)
endif() endif()
endforeach() endforeach()
get_target_property(module_internal_config "${target}" "${property_prefix}QT_MODULE_INTERNAL_CONFIG")
list(APPEND module_internal_config v2) list(APPEND module_internal_config v2)
if(arg_INTERNAL_MODULE) if(arg_INTERNAL_MODULE)