diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-03-23 15:48:56 +1100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-29 10:56:07 +0000 |
| commit | b296202831e8f1bb3a3fda1159289199a7097a71 (patch) | |
| tree | 3e537398a6bd322a5a69532dd725d128f9dbd103 /cmake/Qt3rdPartyLibraryHelpers.cmake | |
| parent | 4e624996a777e9a509338ae25e8a30944fa3963e (diff) | |
Refactor qt_internal_add_plugin() and qt6_add_plugin()
Remove code duplication by calling qt6_add_plugin() from
qt_internal_add_plugin().
Separate out the public and internal arguments for the
variables defined in QtBuild.cmake for these functions.
Provide them via commands instead for greater robustness.
This separation allows other Qt repos to access the appropriate
set of keywords where they define commands that forward
on to *_add_plugin() in their implementations. Retain
the old variables for now to simplify the integration
steps for updating other repos. The old variables can
be removed once there are no more references left to
them in any repo.
Task-number: QTBUG-88763
Change-Id: I0105523afd95995923bd20fc963d245bbb15d34d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit aa4a1006cbccbc180c600f9b4dc9e882bb5ed5ca)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/Qt3rdPartyLibraryHelpers.cmake')
| -rw-r--r-- | cmake/Qt3rdPartyLibraryHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index 4d5ffb96ff..27d615b2b4 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -19,7 +19,7 @@ function(qt_internal_add_cmake_library target) set(is_static_lib 1) elseif(${arg_SHARED}) add_library("${target}" SHARED) - qt_internal_apply_win_prefix_and_suffix("${target}") + _qt_internal_apply_win_prefix_and_suffix("${target}") elseif(${arg_MODULE}) add_library("${target}" MODULE) set_property(TARGET ${name} PROPERTY C_VISIBILITY_PRESET default) @@ -32,7 +32,7 @@ function(qt_internal_add_cmake_library target) # but Qt plugins are actually suffixed with .dylib. set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib") endif() - qt_internal_apply_win_prefix_and_suffix("${target}") + _qt_internal_apply_win_prefix_and_suffix("${target}") else() add_library("${target}") if(NOT BUILD_SHARED_LIBS) |