diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-25 12:33:15 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-03-02 10:23:54 +0100 |
| commit | e7586119e1ba48844a9353e5b9cb6f0f26292764 (patch) | |
| tree | f05e9bf5afb87ed70d620ead96e282defaebc26b /src/corelib/Qt6CoreConfigExtras.cmake.in | |
| parent | fef455999aa2930289137115ab446761cd4b40db (diff) | |
Add the _qt_internal_android_executable_finalizer wrapper function
_qt_internal_android_executable_finalizer wraps Android-related
function that are needed to created an Android package.
The function is added to the INTERFACE_QT_EXECUTABLE_FINALIZERS
property in Qt Core so it's called implicitly for user projects.
Pick-to: 6.3
Change-Id: I140f53341691dcfdc6ae2ddea520818cf2834eb6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6CoreConfigExtras.cmake.in')
| -rw-r--r-- | src/corelib/Qt6CoreConfigExtras.cmake.in | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in index 3b9cbb883d..8b4d3164cf 100644 --- a/src/corelib/Qt6CoreConfigExtras.cmake.in +++ b/src/corelib/Qt6CoreConfigExtras.cmake.in @@ -13,11 +13,17 @@ endif() # set(_qt5_corelib_extra_includes) if (NOT QT_NO_CREATE_TARGETS) + set(__qt_core_target @QT_CMAKE_EXPORT_NAMESPACE@::Core) + get_property(__qt_core_aliased_target TARGET ${__qt_core_target} PROPERTY ALIASED_TARGET) + if(__qt_core_aliased_target) + set(__qt_core_target "${__qt_core_aliased_target}") + endif() + unset(__qt_core_aliased_target) if (NOT "@QT_NAMESPACE@" STREQUAL "") - set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_NAMESPACE=@QT_NAMESPACE@) + set_property(TARGET ${__qt_core_target} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_NAMESPACE=@QT_NAMESPACE@) endif() - set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>) - set_property(TARGET @QT_CMAKE_EXPORT_NAMESPACE@::Core PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype) + set_property(TARGET ${__qt_core_target} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>) + set_property(TARGET ${__qt_core_target} PROPERTY INTERFACE_COMPILE_FEATURES cxx_decltype) endif() set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT") @@ -50,6 +56,12 @@ if(ANDROID_PLATFORM) include("${CMAKE_CURRENT_LIST_DIR}/@QT_CMAKE_EXPORT_NAMESPACE@AndroidMacros.cmake") _qt_internal_create_global_android_targets() _qt_internal_collect_default_android_abis() + if(NOT QT_NO_CREATE_TARGETS) + set_property(TARGET ${__qt_core_target} APPEND PROPERTY + INTERFACE_QT_EXECUTABLE_FINALIZERS + _qt_internal_android_executable_finalizer + ) + endif() endif() if(EMSCRIPTEN) @@ -57,3 +69,5 @@ if(EMSCRIPTEN) endif() _qt_internal_override_example_install_dir_to_dot() + +unset(__qt_core_target) |