diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-05-21 11:42:24 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-05-22 18:07:02 +0200 |
| commit | ecbf6c5b00aca0792f0b73344f5e9810900682a7 (patch) | |
| tree | 695ec5ffacf934292e0adee33d2809910e395f92 /cmake/QtModuleHelpers.cmake | |
| parent | 8789ace197bfcc209002f9f8ec30f00e9cf25e8a (diff) | |
Add export of the Private targets for the internal modules
We need to export the Private targets of the internal modules to keep
compatibility with existing internal module users across repositories.
Amends 425ff34aa10a02524f2d52f544dc00b539ef9a26
Fixes: QTBUG-93943
Change-Id: I10234cec1eb618b69d041f80fbe29620a4e307b9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index bb793f7217..9704523f89 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -193,15 +193,12 @@ function(qt_internal_add_module target) set_property(TARGET "${target_private}" APPEND PROPERTY EXPORT_PROPERTIES _qt_config_module_name) elseif(arg_INTERNAL_MODULE) - # TODO: We need to create temporary alias targets for the internal modules to keep the + # TODO: We need to create temporary private targets for the internal modules to keep the # existing code compatible to the internal modules that don't have the 'Private' suffix yet. # Remove this once the migration is complete. - set(versionless_private_alias "Qt::${target_private}") - set(versionfull_private_alias "Qt${PROJECT_VERSION_MAJOR}::${target_private}") - add_library("${versionless_private_alias}" ALIAS "${target}") - add_library("${versionfull_private_alias}" ALIAS "${target}") - unset(versionless_private_alias) - unset(versionfull_private_alias) + add_library("${target_private}" INTERFACE) + qt_internal_add_target_aliases("${target_private}") + target_link_libraries(${target_private} INTERFACE ${target}) endif() if(NOT arg_HEADER_MODULE) @@ -629,7 +626,8 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") file(COPY ${extra_cmake_files} DESTINATION "${config_build_dir}") set(exported_targets ${target}) - if(NOT ${arg_NO_PRIVATE_MODULE}) + #TODO: remove the 'OR arg_INTERNAL_MODULE' part once renaming of internal modules is finished. + if(NOT ${arg_NO_PRIVATE_MODULE} OR arg_INTERNAL_MODULE) list(APPEND exported_targets ${target_private}) endif() set(export_name "${INSTALL_CMAKE_NAMESPACE}${target}Targets") |