diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-16 16:32:57 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-16 15:58:38 +0000 |
| commit | 3cb9ee3a5b36e2c10dbaf1564852472e7e02a1ae (patch) | |
| tree | 3843cf55ccc4aa72693731803866effa29070bf0 /cmake/QtBaseGlobalTargets.cmake | |
| parent | 87a6283fbb07b7aa5ba3dd4d6bcb581777dc4303 (diff) | |
Fix Android build for other Qt modules
Install missing QtBuildInternalsAndroid to installation path.
Change-Id: I6141ff72b57a6445f1718bc17d64a7ed59a91620
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBaseGlobalTargets.cmake')
| -rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index 84ead6244f..f17b47f675 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -101,6 +101,9 @@ elseif(ANDROID) list(APPEND init_platform "set(ANDROID_NATIVE_API_LEVEL \"${ANDROID_NATIVE_API_LEVEL}\" CACHE STRING \"\")") list(APPEND init_platform "set(ANDROID_STL \"${ANDROID_STL}\" CACHE STRING \"\")") list(APPEND init_platform "set(ANDROID_ABI \"${ANDROID_ABI}\" CACHE STRING \"\")") + list(APPEND init_platform "if (NOT DEFINED ANDROID_SDK_ROOT)") + list(APPEND init_platform " set(ANDROID_SDK_ROOT \"${ANDROID_SDK_ROOT}\" CACHE STRING \"\")") + list(APPEND init_platform "endif()") endif() string(REPLACE ";" "\n" init_vcpkg "${init_vcpkg}") @@ -222,6 +225,7 @@ configure_file( qt_install(FILES "${__build_internals_build_dir}/${INSTALL_CMAKE_NAMESPACE}BuildInternalsConfig.cmake" "${__build_internals_build_dir}/QtBuildInternalsExtra.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBuildInternals/QtBuildInternalsAndroid.cmake" DESTINATION "${__build_internals_install_dir}" COMPONENT Devel ) |