diff options
author | Li Xinwei <1326710505@qq.com> | 2022-04-30 23:38:02 +0800 |
---|---|---|
committer | Li Xinwei <1326710505@qq.com> | 2022-05-20 17:41:20 +0800 |
commit | 9539c8a7f842a6789157ac49dc230a01f4a76d94 (patch) | |
tree | fd48f78e9c96305672608cb060484e302b6ea1b9 /cmake/QtModuleHelpers.cmake | |
parent | efc02f9cc301f98c77079adae026ffd07f50d5ab (diff) |
CMake: set correct COMPILE_PDB_NAME for static libraries
Output names of static libraries might be different from target names.
For example, the library name of Qt6::DeviceDiscoverySupportPrivate is
"Qt6DeviceDiscoverySupport.lib", and the library name of
Qt6::QTlsBackendCertOnlyPlugin is "qcertonlybackend.lib".
This commit make pdb files names consistent with the library names.
And make sure we have set correct OUTPUT_NAME property before calling
qt_set_common_target_properties()/qt_internal_set_compile_pdb_names().
Change-Id: Idb3cacd7a46a4f298fd584b927b5d726956faea8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
-rw-r--r-- | cmake/QtModuleHelpers.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 6821d1e19d..0d17d0b362 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -177,7 +177,6 @@ function(qt_internal_add_module target) set(property_prefix "INTERFACE_") if(NOT arg_HEADER_MODULE) - qt_set_common_target_properties(${target}) set(property_prefix "") endif() @@ -293,6 +292,8 @@ function(qt_internal_add_module target) ) endif() + qt_set_common_target_properties(${target}) + if (WIN32 AND BUILD_SHARED_LIBS) _qt_internal_generate_win32_rc_file(${target}) endif() |