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/Qt3rdPartyLibraryHelpers.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/Qt3rdPartyLibraryHelpers.cmake')
| -rw-r--r-- | cmake/Qt3rdPartyLibraryHelpers.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index d562024ca3..1db4683c69 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -162,10 +162,6 @@ function(qt_internal_add_3rdparty_library target) qt_internal_add_common_qt_library_helper(${target} ${library_helper_args}) - if(NOT arg_INTERFACE) - qt_set_common_target_properties(${target}) - endif() - set_target_properties(${target} PROPERTIES _qt_module_interface_name "${target}" ) @@ -195,6 +191,10 @@ function(qt_internal_add_3rdparty_library target) OUTPUT_NAME "${INSTALL_CMAKE_NAMESPACE}${target}" ) + if(NOT arg_INTERFACE) + qt_set_common_target_properties(${target}) + endif() + if(NOT arg_SKIP_AUTOMOC) qt_autogen_tools_initial_setup(${target}) endif() |