Differential D26749 Diff 76876 toolchain/ECMAndroidDeployQt.cmake

Changeset View

Standalone View

View Options

toolchain/ECMAndroidDeployQt.cmake

1cmake_minimum_required (VERSION 3.7 FATAL_ERROR) 1​cmake_minimum_required (VERSION 3.7 FATAL_ERROR)
2find_package(Qt5Core REQUIRED) 2​find_package(Qt5Core REQUIRED)
3 3​
4function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_PATH) 4​function(ecm_androiddeployqt QTANDROID_EXPORTED_TARGET ECM_ADDITIONAL_FIND_ROOT_PATH)
5 set(EXPORT_DIR "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/") 5​ set(EXPORT_DIR "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}_build_apk/")
6​ if (Qt5Core_VERSION VERSION_LESS 5.14.0)
6 set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so") 7​ set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so")
8​ else()
9​ set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${CMAKE_ANDROID_ARCH_ABI}/lib${QTANDROID_EXPORTED_TARGET}_${CMAKE_ANDROID_ARCH_ABI}.so")
10​ endif()
7 set(QML_IMPORT_PATHS "") 11​ set(QML_IMPORT_PATHS "")
8 foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) 12​ foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
9 # qmlimportscanner chokes on symlinks, so we need to resolve those first 13​ # qmlimportscanner chokes on symlinks, so we need to resolve those first
10 get_filename_component(qml_path "${prefix}/lib/qml" REALPATH) 14​ get_filename_component(qml_path "${prefix}/lib/qml" REALPATH)
11 if(EXISTS ${qml_path}) 15​ if(EXISTS ${qml_path})
12 if (QML_IMPORT_PATHS) 16​ if (QML_IMPORT_PATHS)
13 set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}") 17​ set(QML_IMPORT_PATHS "${QML_IMPORT_PATHS},${qml_path}")
14 else() 18​ else()
15 set(QML_IMPORT_PATHS "${qml_path}") 19​ set(QML_IMPORT_PATHS "${qml_path}")
16 endif() 20​ endif()
17 endif() 21​ endif()
18 endforeach() 22​ endforeach()
19 if (QML_IMPORT_PATHS) 23​ if (QML_IMPORT_PATHS)
20 set(DEFINE_QML_IMPORT_PATHS "\"qml-import-paths\": \"${QML_IMPORT_PATHS}\",") 24​ set(DEFINE_QML_IMPORT_PATHS "\"qml-import-paths\": \"${QML_IMPORT_PATHS}\",")
21 endif() 25​ endif()
22 26​
23 set(EXTRA_PREFIX_DIRS "") 27​ set(EXTRA_PREFIX_DIRS "")
24 foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH}) 28​ foreach(prefix ${ECM_ADDITIONAL_FIND_ROOT_PATH})
25 if (EXTRA_PREFIX_DIRS) 29​ if (EXTRA_PREFIX_DIRS)
26 set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"") 30​ set(EXTRA_PREFIX_DIRS "${EXTRA_PREFIX_DIRS}, \"${prefix}\"")
27 else() 31​ else()
28 set(EXTRA_PREFIX_DIRS "\"${prefix}\"") 32​ set(EXTRA_PREFIX_DIRS "\"${prefix}\"")
29 endif() 33​ endif()
30 endforeach() 34​ endforeach()
35​
36​ if (Qt5Core_VERSION VERSION_LESS 5.14.0)
37​ set(_deployment_file_template "${_CMAKE_ANDROID_DIR}/deployment-file.json.in")
38​ else()
39​ set(_deployment_file_template "${_CMAKE_ANDROID_DIR}/deployment-file-qt514.json.in")
40​ endif()
31 string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME) 41​ string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" _LOWER_CMAKE_HOST_SYSTEM_NAME)
32 configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in" "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1") 42​ configure_file("${_deployment_file_template}" "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
33 file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in2" 43​ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in2"
34 INPUT "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1") 44​ INPUT "${CMAKE_BINARY_DIR}/${QTANDROID_EXPORTED_TARGET}-deployment.json.in1")
35 45​
36 if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") 46​ if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
37 set(arguments "\\$(ARGS)") 47​ set(arguments "\\$(ARGS)")
38 endif() 48​ endif()
39 49​
40 function(havestl var access VALUE) 50​ function(havestl var access VALUE)
Show All 34 Lines