Skip to content

Commit 74b5f9a

Browse files
committed
[commontk] cmake: Simplify mapping of Qt wrapped library to component
This simplifies the mapping of Qt wrapped libraries to their components by removing the redundant version-specific prefix 'qt5' from variable names.
1 parent d503032 commit 74b5f9a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ endif()
7676
set(qtlib_to_wraplib_Widgets gui)
7777
set(qtlib_to_wraplib_WebKitWidgets webkit)
7878

79-
set(qt5_wrapped_lib_depends_gui Multimedia PrintSupport)
80-
set(qt5_wrapped_lib_depends_multimedia MultimediaWidgets)
81-
set(qt5_wrapped_lib_depends_quick QuickWidgets)
79+
set(qt_wrapped_lib_depends_gui Multimedia PrintSupport)
80+
set(qt_wrapped_lib_depends_multimedia MultimediaWidgets)
81+
set(qt_wrapped_lib_depends_quick QuickWidgets)
8282

8383
foreach(qtlib ${qtlibs})
8484
string(TOLOWER ${qtlib} qtlib_lowercase)
@@ -119,7 +119,7 @@ set(qt_required_components Core Widgets)
119119
foreach(qtlib ${qtlibs})
120120
set(qt_wrapped_lib ${qtlib_to_wraplib_${qtlib}})
121121
if(${PythonQt_Wrap_Qt${qt_wrapped_lib}})
122-
list(APPEND qt_required_components ${qtlib} ${qt${PythonQt_QT_VERSION}_wrapped_lib_depends_${qt_wrapped_lib}})
122+
list(APPEND qt_required_components ${qtlib} ${qt_wrapped_lib_depends_${qt_wrapped_lib}})
123123
endif()
124124
endforeach()
125125
if(BUILD_TESTING)

0 commit comments

Comments
 (0)