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

Unset the temporary variables in Dependencies scripts

Browse Source 
Unset the temporary variables to avoid littering the scope.

Pick-to: 6.8 6.9
Change-Id: Ibd6b2896113a9fcd9eae7bc202dc0dc8c7a9f9bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2024-12-23 20:32:19 +01:00
parent 1360824179
commit 96bb0db5af
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtModuleDependencies.cmake.in
View File

@ -32,16 +32,20 @@ endif()
set(__qt_@target@_third_party_deps "@third_party_deps@") set(__qt_@target@_third_party_deps "@third_party_deps@")
@third_party_deps_extra_info@ @third_party_deps_extra_info@
_qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps) _qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps)
unset(__qt_@target@_third_party_deps)
# Find Qt tool package. # Find Qt tool package.
set(__qt_@target@_tool_deps "@main_module_tool_deps@") set(__qt_@target@_tool_deps "@main_module_tool_deps@")
_qt_internal_find_tool_dependencies("@target@" __qt_@target@_tool_deps) _qt_internal_find_tool_dependencies("@target@" __qt_@target@_tool_deps)
unset(__qt_@target@_tool_deps)
# note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0" # note: target_deps example: "Qt6Core\;5.12.0;Qt6Gui\;5.12.0"
set(__qt_@target@_target_deps "@target_deps@") set(__qt_@target@_target_deps "@target_deps@")
set(__qt_@target@_find_dependency_paths "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}") set(__qt_@target@_find_dependency_paths "${CMAKE_CURRENT_LIST_DIR}/.." "${_qt_cmake_dir}")
_qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps _qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps
__qt_@target@_find_dependency_paths) __qt_@target@_find_dependency_paths)
unset(__qt_@target@_target_deps)
unset(__qt_@target@_find_dependency_paths)
set(_@QT_CMAKE_EXPORT_NAMESPACE@@target@_MODULE_DEPENDENCIES "@qt_module_dependencies@") set(_@QT_CMAKE_EXPORT_NAMESPACE@@target@_MODULE_DEPENDENCIES "@qt_module_dependencies@")
set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE) set(@INSTALL_CMAKE_NAMESPACE@@target@_FOUND TRUE)

3
cmake/QtPluginDependencies.cmake.in
View File

@ -6,6 +6,7 @@ set(@target@_FOUND TRUE)
# note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;" # note: _third_party_deps example: "ICU\\;FALSE\\;1.0\\;i18n uc data;ZLIB\\;FALSE\\;\\;"
set(__qt_@target@_third_party_deps "@third_party_deps@") set(__qt_@target@_third_party_deps "@third_party_deps@")
_qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps) _qt_internal_find_third_party_dependencies("@target@" __qt_@target@_third_party_deps)
unset(__qt_@target@_third_party_deps)
set(__qt_use_no_default_path_for_qt_packages "NO_DEFAULT_PATH") set(__qt_use_no_default_path_for_qt_packages "NO_DEFAULT_PATH")
if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES) if(QT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES)
@ -17,6 +18,8 @@ set(__qt_@target@_target_deps "@target_deps@")
set(__qt_@target@_find_dependency_paths "@find_dependency_paths@") set(__qt_@target@_find_dependency_paths "@find_dependency_paths@")
_qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps _qt_internal_find_qt_dependencies("@target@" __qt_@target@_target_deps
__qt_@target@_find_dependency_paths) __qt_@target@_find_dependency_paths)
unset(__qt_@target@_target_deps)
unset(__qt_@target@_find_dependency_paths)
if(__qt_${target}_missing_deps) if(__qt_${target}_missing_deps)
set(@target@_FOUND FALSE) set(@target@_FOUND FALSE)