diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-11 13:36:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-15 10:51:59 +0000 |
| commit | 3e8ea87ef8eb8dc3f429d7c7469d9113702b067f (patch) | |
| tree | cf378d9c087435b3c0dff19a3bbff9a6d5b319dc /src/corelib | |
| parent | 36d693eb4eff766322aea4c301ceeadc724625a7 (diff) | |
Adjust the EntryPoint target name according to the internal module naming policy
Task-number: QTBUG-87775
Change-Id: I1d6097c950f97e102c44e2952edc98caa4deb6c6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 02855ff6e076d04b7ae748c2485f1e098c32d698)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index ac7df9b9a4..52679b591f 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1331,10 +1331,10 @@ qt_internal_apply_gc_binaries_conditional(Core PUBLIC) # Add entry-point on platforms that need it. A project can opt-out of using the # entrypoint by setting the qt_no_entrypoint property to TRUE on a target. if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "iOS") - # find_package(Qt6Core) should call find_package(Qt6EntryPoint) so that we can - # link against EntryPoint. Normally this is handled automatically for deps, but - # for some reason it doesn't work for the EntryPoint, so we need to add it manually. - qt_record_extra_qt_package_dependency(Core EntryPoint "${PROJECT_VERSION}") + # find_package(Qt6Core) should call find_package(Qt6EntryPointPrivate) so that we can + # link against EntryPointPrivate. Normally this is handled automatically for deps, but + # for some reason it doesn't work for the EntryPointPrivate, so we need to add it manually. + qt_record_extra_qt_package_dependency(Core EntryPointPrivate "${PROJECT_VERSION}") set(entrypoint_conditions "$<NOT:$<BOOL:$<TARGET_PROPERTY:qt_no_entrypoint>>>") list(APPEND entrypoint_conditions "$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>") @@ -1346,7 +1346,9 @@ if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "iOS") list(JOIN entrypoint_conditions "," entrypoint_conditions) set(entrypoint_conditions "$<AND:${entrypoint_conditions}>") - target_link_libraries(Core INTERFACE "$<${entrypoint_conditions}:${QT_CMAKE_EXPORT_NAMESPACE}::EntryPoint>") + target_link_libraries(Core INTERFACE + "$<${entrypoint_conditions}:${QT_CMAKE_EXPORT_NAMESPACE}::EntryPointPrivate>" + ) endif() # Record darwin minimum deployment target. |