summaryrefslogtreecommitdiffstats
path: root/cmake/QtResourceHelpers.cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-11-29 21:18:43 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-12-02 12:53:34 +0100
commit75eb08711ef7a51305b4daad411548a2b6b4f8c6 (patch)
tree780ba3b17d526695a72c56d9f0022a64507a0f95 /cmake/QtResourceHelpers.cmake
parent6b02473e1e4b559cb81c007a35a07746d843398c (diff)
Install MSVC debug information for resource object libraries
Building against a static debug MSVC Qt produced LNK4099 warnings (PDB was not found with object file). This was because we did not install the .pdb files for the object libraries that are created for Qt resources. Now, these .pdb files are named like the object library targets and are installed next to the object files. Pick-to: 6.2 Fixes: QTBUG-97699 Change-Id: I7e23f8392b7ac657be1d2fb3b33e051ae2e4d407 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'cmake/QtResourceHelpers.cmake')
-rw-r--r--cmake/QtResourceHelpers.cmake18
1 files changed, 18 insertions, 0 deletions
diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake
index 6e979e1d14..b51a83901d 100644
--- a/cmake/QtResourceHelpers.cmake
+++ b/cmake/QtResourceHelpers.cmake
@@ -26,6 +26,7 @@ function(qt_internal_add_resource target resourceName)
EXPORT_NAME_PREFIX "${INSTALL_CMAKE_NAMESPACE}${target}"
)
+ qt_internal_install_resource_pdb_files("${out_targets}")
qt_internal_record_rcc_object_files("${target}" "${out_targets}"
INSTALL_DIRECTORY "${INSTALL_LIBDIR}")
endif()
@@ -90,3 +91,20 @@ function(qt_internal_record_rcc_object_files target resource_targets)
qt_internal_link_internal_platform_for_object_library("${out_target}")
endforeach()
endfunction()
+
+function(qt_internal_install_resource_pdb_files objlib_targets)
+ if(NOT MSVC OR NOT QT_WILL_INSTALL)
+ return()
+ endif()
+
+ foreach(target IN LISTS objlib_targets)
+ qt_internal_set_compile_pdb_names(${target})
+
+ get_target_property(generated_cpp_file_relative_path
+ ${target}
+ _qt_resource_generated_cpp_relative_path)
+ get_filename_component(rel_obj_file_dir "${generated_cpp_file_relative_path}" DIRECTORY)
+ qt_internal_install_pdb_files(${target}
+ "${INSTALL_LIBDIR}/objects-$<CONFIG>/${target}/${rel_obj_file_dir}")
+ endforeach()
+endfunction()