whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate Qt6EntryPointAdditionalTargetInfo independent of platform 

Move AdditionalTargetInfo generation for EntryPoint target out of
WIN32 specific block

Fixes: QTBUG-90414
Change-Id: I8dc34c939f12ef2073de630d4440a0892d8be909
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 32734f351b076b8774c490c27ef18ddd2243dcaf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Alexey Edelev 2021-01-19 15:34:44 +01:00 committed by Qt Cherry-pick Bot
parent 15576c9610
commit df788cca8b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/entrypoint/CMakeLists.txt
View File

@ -20,6 +20,7 @@ qt_internal_add_module(EntryPoint
NO_ADDITIONAL_TARGET_INFO
)
set(export_targets EntryPoint)
# We don't need any include paths or default module defines
set_target_properties(EntryPoint PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ""
@ -38,6 +39,8 @@ if(using_entrypoint_library)
$<TARGET_PROPERTY:Qt::Core,INTERFACE_INCLUDE_DIRECTORIES>
)
list(APPEND export_targets EntryPointImplementation)
set_target_properties(EntryPointImplementation PROPERTIES
OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}EntryPoint${QT_LIBINFIX}"
ARCHIVE_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_LIBDIR}"
@ -102,13 +105,13 @@ QT.entrypoint_implementation.module_config = staticlib v2 internal_module
set(export_name "${INSTALL_CMAKE_NAMESPACE}EntryPointTargets")
qt_install(TARGETS EntryPointImplementation EXPORT ${export_name})
qt_generate_prl_file(EntryPointImplementation "${INSTALL_LIBDIR}")
set(export_name_prefix "${INSTALL_CMAKE_NAMESPACE}EntryPoint")
qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${export_name_prefix})
qt_internal_export_additional_targets_file(
TARGETS EntryPoint EntryPointImplementation
EXPORT_NAME_PREFIX ${export_name_prefix}
CONFIG_INSTALL_DIR "${config_install_dir}")
endif()
set(export_name_prefix "${INSTALL_CMAKE_NAMESPACE}EntryPoint")
qt_path_join(config_install_dir ${QT_CONFIG_INSTALL_DIR} ${export_name_prefix})
qt_internal_export_additional_targets_file(
TARGETS ${export_targets}
EXPORT_NAME_PREFIX ${export_name_prefix}
CONFIG_INSTALL_DIR "${config_install_dir}")
# special case end