Remove unnecessary version of module from _MODULE_DEPENDENCIES
_<module>_MODULE_DEPENDENCIES variable in the <module>Dependnecies.cmake should only contain the list of targets that module depends on, but not versions. Version of the first module appears in the list because of the regression introduced in425ff34aa1
Amends425ff34aa1
Pick-to: 6.2 Change-Id: Iaa42120af6bac742bdf0f8d389bd8e5bdef9c1d1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
e7455644a2
commit
2059d294eb
@ -226,7 +226,16 @@ function(qt_internal_create_module_depends_file target)
|
|||||||
foreach(dep ${target_deps})
|
foreach(dep ${target_deps})
|
||||||
if(NOT dep MATCHES ".+Private$" AND
|
if(NOT dep MATCHES ".+Private$" AND
|
||||||
dep MATCHES "${INSTALL_CMAKE_NAMESPACE}(.+)")
|
dep MATCHES "${INSTALL_CMAKE_NAMESPACE}(.+)")
|
||||||
list(APPEND qt_module_dependencies "${CMAKE_MATCH_1}")
|
# target_deps cointains elements that are a pair of target name and version,
|
||||||
|
# e.g. 'Core\;6.2'
|
||||||
|
# After the extracting from the target_deps list, the element becomes a list itself,
|
||||||
|
# because it loses escape symbol before the semicolon, so ${CMAKE_MATCH_1} is the list:
|
||||||
|
# Core;6.2.
|
||||||
|
# We need to store only the target name in the qt_module_dependencies variable.
|
||||||
|
list(GET CMAKE_MATCH_1 0 dep_name)
|
||||||
|
if(dep_name)
|
||||||
|
list(APPEND qt_module_dependencies "${dep_name}")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
list(REMOVE_DUPLICATES qt_module_dependencies)
|
list(REMOVE_DUPLICATES qt_module_dependencies)
|
||||||
|
Loading…
Reference in New Issue
Block a user