diff options
| author | Matthew Woehlke <matthew.woehlke@kitware.com> | 2013-08-07 13:26:24 -0400 |
|---|---|---|
| committer | John Ehresman <jpe@wingware.com> | 2014-04-15 22:52:38 +0200 |
| commit | 80a58c4b0bdf0f3273957c72b3a77f4fae442432 (patch) | |
| tree | d4ce35df8fdbb1feec704a9d72ef3d3ec0384762 /PySide | |
| parent | 14976792ee1360c02b43e12d246b4de2ebdfd8a3 (diff) | |
Fix bug PYSIDE-172: multiple rules for file
Remove moc_qpytextobject.cxx from the list of Shiboken-generated files,
as it is properly generated by MOC, and being in both places causes some
generators (e.g. Ninja) to be unhappy about having multiple rules that
(claim to) generate it.
Change-Id: I2458502852f792661120f561a59ad9a198286005
Reviewed-by: John Ehresman <jpe@wingware.com>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 762563449..6e147067f 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -403,7 +403,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qwizard_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp ${SPECIFIC_OS_FILES} -${QPYTEXTOBJECT_MOC} ${QtGui_46_SRC} ${QtGui_47_SRC} ${QtGui_OPTIONAL_SRC} @@ -434,7 +433,7 @@ create_pyside_module(QtGui QtGui_deps QtGui_typesystem_path QtGui_SRC - "" + QPYTEXTOBJECT_MOC ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml) install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/) |