diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-12-11 16:38:39 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-11 22:27:27 +0000 |
| commit | 9b3e80cd87cc31825d046a2d8670598f9589461c (patch) | |
| tree | eba69a7b10ca63ca979c2aa38f806d921e964477 /cmake | |
| parent | 384864e3ddae6e6796944389f601a2f5b17f902b (diff) | |
Android: install android test scripts to libexec to test on all modules
The scripts that are used by Android test VMs are now located in qtbase
and are not easily usable by other modules. To fix that and allow other
modules to use those scripts, we install them with cmake into libexec.
Task-number: QTQAINFRA-4052
Change-Id: Ibdd3658fd9fe7e007104a85d9999028a2de99a33
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f3cfdb905b926948659f37924837b3c14868ff6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtWrapperScriptHelpers.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake index 803ed676ad..3f8fbca54f 100644 --- a/cmake/QtWrapperScriptHelpers.cmake +++ b/cmake/QtWrapperScriptHelpers.cmake @@ -125,6 +125,7 @@ function(qt_internal_create_wrapper_scripts) DESTINATION "${INSTALL_BINDIR}") qt_internal_create_qt_configure_tests_wrapper_script() + qt_internal_install_android_helper_scripts() endfunction() function(qt_internal_create_qt_configure_tests_wrapper_script) @@ -156,3 +157,11 @@ function(qt_internal_create_qt_configure_tests_wrapper_script) qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}" DESTINATION "${INSTALL_BINDIR}") endfunction() + +function(qt_internal_install_android_helper_scripts) + qt_path_join(destination "${QT_INSTALL_DIR}" "${INSTALL_LIBEXECDIR}") + qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_emulator_launcher.sh" + DESTINATION "${destination}") + qt_copy_or_install(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/util/android/android_cmakelist_patcher.sh" + DESTINATION "${destination}") +endfunction() |