AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename arg_HEADER_MODULE variable to 'is_interface_lib'

Browse Source 
Variables starting with 'arg_' usually are the result of the
cmake_parse_arguments call. It's better to not use them for the regular
variables for readability.

Change-Id: I4054c63d3e48b2a27d8a632cd8908a59302afa47
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2022-08-10 16:25:19 +02:00
parent a3e8d28fdb
commit 9029b90538
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/QtPostProcessHelpers.cmake
View File

@ -105,14 +105,13 @@ endfunction()
function(qt_internal_create_module_depends_file target) function(qt_internal_create_module_depends_file target)
get_target_property(target_type "${target}" TYPE) get_target_property(target_type "${target}" TYPE)
set(is_interface_lib FALSE)
if(target_type STREQUAL "INTERFACE_LIBRARY") if(target_type STREQUAL "INTERFACE_LIBRARY")
set(arg_HEADER_MODULE ON) set(is_interface_lib TRUE)
else()
set(arg_HEADER_MODULE OFF)
endif() endif()
set(depends "") set(depends "")
if(target_type STREQUAL "STATIC_LIBRARY" AND NOT arg_HEADER_MODULE) if(target_type STREQUAL "STATIC_LIBRARY")
get_target_property(depends "${target}" LINK_LIBRARIES) get_target_property(depends "${target}" LINK_LIBRARIES)
endif() endif()
@ -129,7 +128,7 @@ function(qt_internal_create_module_depends_file target)
set(target_deps_seen "") set(target_deps_seen "")
set(qt_module_dependencies "") set(qt_module_dependencies "")
if(NOT arg_HEADER_MODULE) if(NOT is_interface_lib)
get_target_property(extra_depends "${target}" QT_EXTRA_PACKAGE_DEPENDENCIES) get_target_property(extra_depends "${target}" QT_EXTRA_PACKAGE_DEPENDENCIES)
endif() endif()
if(NOT extra_depends MATCHES "-NOTFOUND$") if(NOT extra_depends MATCHES "-NOTFOUND$")
@ -161,7 +160,7 @@ function(qt_internal_create_module_depends_file target)
# Extra QtFooModuleTools packages to be added as dependencies to # Extra QtFooModuleTools packages to be added as dependencies to
# QtModuleDependencies.cmake. Needed for QtWaylandCompositor / QtWaylandClient. # QtModuleDependencies.cmake. Needed for QtWaylandCompositor / QtWaylandClient.
if(NOT arg_HEADER_MODULE) if(NOT is_interface_lib)
get_target_property(extra_tools_package_dependencies "${target}" get_target_property(extra_tools_package_dependencies "${target}"
QT_EXTRA_TOOLS_PACKAGE_DEPENDENCIES) QT_EXTRA_TOOLS_PACKAGE_DEPENDENCIES)
if(extra_tools_package_dependencies) if(extra_tools_package_dependencies)