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

CMake: Tidy up documentation regarding android library collection

Browse Source 
Pick-to: 6.3 6.4
Change-Id: I3167855ef3a390a51d7bb0c703f47392b07cb2ac
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Alexandru Croitor 2022-08-18 16:54:30 +02:00
parent a6266810ae
commit fb284a3c47
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/Qt6AndroidMacros.cmake
View File

@ -587,8 +587,8 @@ function(_qt_internal_collect_apk_dependencies_defer)
endif() endif()
endfunction() endfunction()
# The function collects shared libraries from the build system tree, that might be dependencies for # The function collects project-built shared libraries that might be dependencies for
# the main apk targets. # the main apk targets. It stores their locations in a global custom target property.
function(_qt_internal_collect_apk_dependencies) function(_qt_internal_collect_apk_dependencies)
# User opted-out the functionality # User opted-out the functionality
if(QT_NO_COLLECT_BUILD_TREE_APK_DEPS) if(QT_NO_COLLECT_BUILD_TREE_APK_DEPS)
@ -631,8 +631,8 @@ function(_qt_internal_collect_apk_dependencies)
) )
endfunction() endfunction()
# The function recursively goes through the project subfolders and collects targets that supposed to # This function recursively walks the current directory and its subdirectories to collect shared
# be shared libraries of any kind. # library targets built in those directories.
function(_qt_internal_collect_buildsystem_shared_libraries out_var subdir) function(_qt_internal_collect_buildsystem_shared_libraries out_var subdir)
set(result "") set(result "")
get_directory_property(buildsystem_targets DIRECTORY ${subdir} BUILDSYSTEM_TARGETS) get_directory_property(buildsystem_targets DIRECTORY ${subdir} BUILDSYSTEM_TARGETS)

16
src/corelib/doc/src/cmake/qt_finalize_project.qdoc
View File

@ -8,7 +8,7 @@
\title qt_finalize_project \title qt_finalize_project
\target qt6_finalize_project \target qt6_finalize_project
\summary {Handles various common platform-specific tasks associated with Qt project.} \summary {Handles various common platform-specific tasks associated with a Qt project.}
\preliminarycmakecommand \preliminarycmakecommand
\include cmake-find-package-core.qdocinc \include cmake-find-package-core.qdocinc
@ -26,13 +26,17 @@ qt_finalize_project()
\section1 Description \section1 Description
Some targets that are created using Qt commands require additional actions Some targets that are created using Qt commands require additional actions
at the end of CMake configuring phase. Depending on the platform the function at the end of CMake configuring phase.
typically walks through the build tree, resolves dependencies between targets Depending on the platform, the function typically:
created by the user, and applies extra deployment steps. \list
\li Walks the build tree.
\li Resolves dependencies.
\li Applies any extra deployment steps.
\endlist
With CMake versions 3.19 and higher, you don't need to call this command since With CMake version 3.19 or later, you don't need to call this command since
it consists of sub-commands that are ordinarily invoked at the end of it consists of sub-commands that are ordinarily invoked at the end of
\c CMAKE_SOURCE_DIR scope. \c CMAKE_SOURCE_DIR directory scope processing.
\include cmake-android-qt-finalize-project-warning.qdocinc \include cmake-android-qt-finalize-project-warning.qdocinc