diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2019-10-18 16:07:45 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@gmail.com> | 2019-10-25 14:54:28 +0200 |
| commit | 52c799ed4425076df4353c02950ea1444fe5f102 (patch) | |
| tree | 750e70289a1b0594e89f2d996dd7fbc7752f7f3b /src/corelib/Qt5ModuleLocation.cmake.in | |
| parent | f3dbe98dca58731ff98dff3cc9111a8252f8e1e6 (diff) | |
Android: Add multi-abi support for CMake
The patch adds ANDROID_BUILD_ABI_<abi> CMake options, which when enabled
will determine CMake to build the current project with the enabled ABI
settings.
When building with CMake and the official Android CMake toolchain
one needs to specify the Qt base directory as an argument to
CMAKE_FIND_ROOT_PATH, which contains the Android NDK sysroot
set by the toolchain.
CMake will consider directories that contain this base path as
valid directories to search packages. In the developer build case we
have to append "lib/cmake" because the Qt base directory passed as
CMAKE_FIND_ROOT_PATH will be the same directory as the developer
build base, and will not be considered.
Change-Id: I180502032c8ea1105bde2456252b367497f511d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/corelib/Qt5ModuleLocation.cmake.in')
| -rw-r--r-- | src/corelib/Qt5ModuleLocation.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt5ModuleLocation.cmake.in b/src/corelib/Qt5ModuleLocation.cmake.in index 5065ada56e..cf70f6bc0e 100644 --- a/src/corelib/Qt5ModuleLocation.cmake.in +++ b/src/corelib/Qt5ModuleLocation.cmake.in @@ -4,7 +4,7 @@ get_filename_component(_qt5_root_dir \"${CMAKE_CURRENT_LIST_DIR}/../../../..\" A file(GLOB qtmodules ${_qt5_root_dir} "${_qt5_root_dir}/*") foreach(qtmodule ${qtmodules}) if(IS_DIRECTORY ${qtmodule}) - list(APPEND _qt5_module_paths ${qtmodule}) + list(APPEND _qt5_module_paths "${qtmodule}" "${qtmodule}/lib/cmake") endif() endforeach() !!ELSE |