diff options
| author | Li Xinwei <1326710505@qq.com> | 2021-08-02 18:16:38 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-03 07:17:07 +0000 |
| commit | e3020055618b48b8427e570b2762a62d877687c5 (patch) | |
| tree | 7439d53eabb4e6c41fc75f22c70c9962c7a942a7 /cmake | |
| parent | a546d0eef5b89869d2198628b4c359f1ec03f201 (diff) | |
Avoid to call _qt_internal_set_up_static_runtime_library() twice
Change-Id: I28985470b3e0b88befbbd2d62a027670d7d6c822
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a25144394910d07d0819c4da5aae058b0912a312)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtPublicPluginHelpers.cmake | 3 | ||||
| -rw-r--r-- | cmake/QtResourceHelpers.cmake | 1 | ||||
| -rw-r--r-- | cmake/QtTargetHelpers.cmake | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index ea3810f107..c90eb2150c 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -74,6 +74,7 @@ function(qt_internal_add_executable name) endif() qt_set_common_target_properties(${name}) + _qt_internal_set_up_static_runtime_library(${name}) if(ANDROID) # On our qmake builds we don't compile the executables with # visibility=hidden. Not having this flag set will cause the diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake index a765157f5f..5023498b73 100644 --- a/cmake/QtPublicPluginHelpers.cmake +++ b/cmake/QtPublicPluginHelpers.cmake @@ -236,14 +236,13 @@ function(__qt_internal_add_static_plugin_init_object_library __qt_internal_get_static_plugin_init_target_name("${plugin_target}" plugin_init_target) - add_library("${plugin_init_target}" OBJECT "${generated_qt_plugin_file_name}") + qt6_add_library("${plugin_init_target}" OBJECT "${generated_qt_plugin_file_name}") target_link_libraries(${plugin_init_target} PRIVATE # Core provides the symbols needed by Q_IMPORT_PLUGIN. ${QT_CMAKE_EXPORT_NAMESPACE}::Core ) - _qt_internal_set_up_static_runtime_library("${plugin_init_target}") set_property(TARGET ${plugin_init_target} PROPERTY _is_qt_plugin_init_target TRUE) set_property(TARGET ${plugin_init_target} APPEND PROPERTY diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake index 092b112333..6e979e1d14 100644 --- a/cmake/QtResourceHelpers.cmake +++ b/cmake/QtResourceHelpers.cmake @@ -88,6 +88,5 @@ function(qt_internal_record_rcc_object_files target resource_targets) set_property(TARGET ${target} APPEND PROPERTY _qt_rcc_objects "${rcc_object_file_path}") qt_internal_link_internal_platform_for_object_library("${out_target}") - qt_set_common_target_properties(${out_target}) endforeach() endfunction() diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 96d6982319..911f25a1ae 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -188,7 +188,6 @@ function(qt_set_common_target_properties target) OBJCXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) endif() - _qt_internal_set_up_static_runtime_library("${target}") qt_internal_set_compile_pdb_names("${target}") endfunction() |