Skip to content

Commit e1e5bca

Browse files
committed
cmake: Fix inclusion of additional sources
This commit fixes a regression introduced in previous commit
1 parent 0401ec7 commit e1e5bca

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

CMakeLists.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ if(NOT DEFINED PythonQt_INSTALL_INCLUDE_DIR)
7878
set(PythonQt_INSTALL_INCLUDE_DIR include/PythonQt)
7979
endif()
8080

81-
set(qt5_wrapped_lib_depends_gui Multimedia)
82-
8381
#-----------------------------------------------------------------------------
8482
# Set qtlib_to_wraplib_* variables
8583

8684
set(qtlib_to_wraplib_Widgets gui)
8785
set(qtlib_to_wraplib_WebKitWidgets webkit)
8886

87+
set(qt5_wrapped_lib_depends_gui Multimedia)
88+
8989
foreach(qtlib ${qtlibs})
9090
string(TOLOWER ${qtlib} qtlib_lowercase)
9191
if(DEFINED qtlib_to_wraplib_${qtlib})
@@ -262,13 +262,15 @@ set(moc_sources
262262
#-----------------------------------------------------------------------------
263263
# Add extra sources
264264

265-
foreach(qtlib ${qt_wrapped_libs})
265+
foreach(qtlib ${qtlibs})
266+
267+
set(qt_wrapped_lib ${qtlib_to_wraplib_${qtlib}})
266268

267-
if (${PythonQt_Wrap_Qt${qtlib}})
269+
if (${PythonQt_Wrap_Qt${qt_wrapped_lib}})
268270

269-
ADD_DEFINITIONS(-DPYTHONQT_WRAP_Qt${qtlib})
271+
ADD_DEFINITIONS(-DPYTHONQT_WRAP_Qt${qt_wrapped_lib})
270272

271-
set(file_prefix generated_cpp${generated_cpp_suffix}/com_trolltech_qt_${qtlib}/com_trolltech_qt_${qtlib})
273+
set(file_prefix generated_cpp${generated_cpp_suffix}/com_trolltech_qt_${qt_wrapped_lib}/com_trolltech_qt_${qt_wrapped_lib})
272274

273275
foreach(index RANGE 0 12)
274276

0 commit comments

Comments
 (0)