diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-26 17:47:16 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-01 12:20:12 +0000 |
| commit | 55265b737583496436d3c62ebd39c4d2a625138b (patch) | |
| tree | 0ea6b8feb5abe51050a2d1dc9a4283ecde8c4e90 /cmake | |
| parent | b16f9068c27b69d7fb55ab20920d835c6f91a7f5 (diff) | |
CMake: Rename internal variable
Rename QT_QMAKE_LIB_TARGETS_foo to QT_TARGETS_OF_QMAKE_LIB_foo, because
we want to introduce the counterpart QT_QMAKE_LIB_OF_TARGET_bar in a
subsequent commit.
Task-number: QTBUG-88951
Change-Id: I33f00f4fe65c5977da6e74c632ebeab3b891c89a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bf483ca9794c8eaafd9007e7e76117bab5bfa35f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtFindPackageHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index f874a6d744..bc38089947 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -166,7 +166,7 @@ macro(qt_find_package) AND (NOT arg_QMAKE_LIB IN_LIST QT_QMAKE_LIBS_FOR_${arg_MODULE_NAME})) set(QT_QMAKE_LIBS_FOR_${arg_MODULE_NAME} ${QT_QMAKE_LIBS_FOR_${arg_MODULE_NAME}};${arg_QMAKE_LIB} CACHE INTERNAL "") - set(QT_QMAKE_LIB_TARGETS_${arg_QMAKE_LIB} ${arg_PROVIDED_TARGETS} CACHE INTERNAL "") + set(QT_TARGETS_OF_QMAKE_LIB_${arg_QMAKE_LIB} ${arg_PROVIDED_TARGETS} CACHE INTERNAL "") endif() endif() endmacro() diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index e0f10d19bb..87cc2cfd10 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -16,7 +16,7 @@ function(qt_generate_qmake_libraries_pri_content module_name output_root_dir out list(JOIN implicit_include_dirs_regex "|" implicit_include_dirs_regex) foreach(lib ${QT_QMAKE_LIBS_FOR_${module_name}}) - set(lib_targets ${QT_QMAKE_LIB_TARGETS_${lib}}) + set(lib_targets ${QT_TARGETS_OF_QMAKE_LIB_${lib}}) string(TOUPPER ${lib} uclib) set(lib_defines "") set(lib_incdir "") |