diff options
| -rw-r--r-- | cmake/ModuleDescription.json.in | 2 | ||||
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cmake/ModuleDescription.json.in b/cmake/ModuleDescription.json.in index 6aae9a4a59..ab5f4e304a 100644 --- a/cmake/ModuleDescription.json.in +++ b/cmake/ModuleDescription.json.in @@ -1,7 +1,7 @@ { "module_name": "${target}", "version": "${PROJECT_VERSION}", - "built_with": { + "built_with": {${extra_build_information} "compiler_id": "${CMAKE_CXX_COMPILER_ID}", "compiler_target": "${CMAKE_CXX_COMPILER_TARGET}", "compiler_version": "${CMAKE_CXX_COMPILER_VERSION}", diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 59340222bb..9a9e3bec1d 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -1021,6 +1021,16 @@ function(qt_describe_module target) if(CMAKE_CROSSCOMPILING) set(cross_compilation "true") endif() + set(extra_build_information "") + if(ANDROID) + string(APPEND extra_build_information " + \"android\": { + \"api_version\": \"${QT_ANDROID_API_VERSION}\", + \"ndk\": { + \"version\": \"${ANDROID_NDK_REVISION}\" + } + },") + endif() configure_file("${descfile_in}" "${descfile_out}") qt_install(FILES "${descfile_out}" DESTINATION "${install_dir}") |