diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-11 13:36:10 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-15 12:51:49 +0200 |
| commit | 02855ff6e076d04b7ae748c2485f1e098c32d698 (patch) | |
| tree | 895a32d67e2d095861a86abf1cc0acc6c52ac380 /cmake | |
| parent | 01d30e2d5331d0d15516ce3bf7559fcc19b69723 (diff) | |
Adjust the EntryPoint target name according to the internal module naming policy
Pick-to: 6.2
Task-number: QTBUG-87775
Change-Id: I1d6097c950f97e102c44e2952edc98caa4deb6c6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFindPackageHelpers.cmake | 6 | ||||
| -rw-r--r-- | cmake/QtPublicWalkLibsHelpers.cmake | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index a980652e60..1853240f22 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -209,14 +209,14 @@ endfunction() # This function records a dependency between ${main_target_name} and ${dep_target_name} # at the CMake package level. -# E.g. Qt6CoreConfig.cmake needs to find_package(Qt6EntryPoint). +# E.g. Qt6CoreConfig.cmake needs to find_package(Qt6EntryPointPrivate). # main_target_name = Core -# dep_target_name = EntryPoint +# dep_target_name = EntryPointPrivate # This is just a convenience function that deals with Qt targets and their associated packages # instead of raw package names. function(qt_record_extra_qt_package_dependency main_target_name dep_target_name dep_package_version) - # EntryPoint -> Qt6EntryPoint. + # EntryPointPrivate -> Qt6EntryPointPrivate. qt_internal_qtfy_target(qtfied_target_name "${dep_target_name}") qt_record_extra_package_dependency("${main_target_name}" "${qtfied_target_name_versioned}" "${dep_package_version}") diff --git a/cmake/QtPublicWalkLibsHelpers.cmake b/cmake/QtPublicWalkLibsHelpers.cmake index 038d5d0625..963c15d4c6 100644 --- a/cmake/QtPublicWalkLibsHelpers.cmake +++ b/cmake/QtPublicWalkLibsHelpers.cmake @@ -83,12 +83,13 @@ function(__qt_internal_walk_libs endif() list(APPEND collected ${target}) - if(target STREQUAL "${QT_CMAKE_EXPORT_NAMESPACE}::EntryPoint") - # We can't (and don't need to) process EntryPoint because it brings in $<TARGET_PROPERTY:prop> - # genexes which get replaced with $<TARGET_PROPERTY:EntryPoint,prop> genexes in the code below - # and that causes 'INTERFACE_LIBRARY targets may only have whitelisted properties.' errors - # with CMake versions equal to or lower than 3.18. These errors are super unintuitive to - # debug because there's no mention that it's happening during a file(GENERATE) call. + if(target STREQUAL "${QT_CMAKE_EXPORT_NAMESPACE}::EntryPointPrivate") + # We can't (and don't need to) process EntryPointPrivate because it brings in + # $<TARGET_PROPERTY:prop> genexes which get replaced with + # $<TARGET_PROPERTY:EntryPointPrivate,prop> genexes in the code below and that causes + # 'INTERFACE_LIBRARY targets may only have whitelisted properties.' errors with CMake + # versions equal to or lower than 3.18. These errors are super unintuitive to debug + # because there's no mention that it's happening during a file(GENERATE) call. return() endif() |