1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617036658

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-29 19:03:00 +00:00
commit ea0ee870c9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/QtPluginHelpers.cmake
View File

@ -328,20 +328,29 @@ function(qt_internal_add_plugin target)
endif() endif()
qt_internal_add_linker_version_script(${target}) qt_internal_add_linker_version_script(${target})
qt_add_list_file_finalizer(qt_finalize_plugin ${target} "${install_directory}") set(finalizer_extra_args "")
if(NOT arg_SKIP_INSTALL)
list(APPEND finalizer_extra_args INSTALL_PATH "${install_directory}")
endif()
qt_add_list_file_finalizer(qt_finalize_plugin ${target} ${finalizer_extra_args})
qt_enable_separate_debug_info(${target} "${install_directory}") if(NOT arg_SKIP_INSTALL)
qt_internal_install_pdb_files(${target} "${install_directory}") qt_enable_separate_debug_info(${target} "${install_directory}")
qt_internal_install_pdb_files(${target} "${install_directory}")
endif()
endfunction() endfunction()
function(qt_finalize_plugin target install_directory) function(qt_finalize_plugin target)
cmake_parse_arguments(arg "" "INSTALL_PATH" "" ${ARGN})
if(WIN32 AND BUILD_SHARED_LIBS) if(WIN32 AND BUILD_SHARED_LIBS)
_qt_internal_generate_win32_rc_file("${target}") _qt_internal_generate_win32_rc_file("${target}")
endif() endif()
# Generate .prl files for plugins of static Qt builds. # Generate .prl files for plugins of static Qt builds.
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
qt_generate_prl_file(${target} "${install_directory}") if(arg_INSTALL_PATH)
qt_generate_prl_file(${target} "${arg_INSTALL_PATH}")
endif()
endif() endif()
endfunction() endfunction()