Import upstream changes to TpQtMacros.cmake

Authored by heikobecker on Aug 16 2017, 5:31 PM.



This adds two commits from

  • d9354dfe: "CMake/TpQtMacros: Added missing dependencies."
  • 8bc55218: "cmake: get rid of the old & ugly syntax of having arguments..."

While the latter is certainly nicer to look at, the former is necessary to
build with cmake 3.9. Otherwise it fails with "IOError: [Errno 2] No such
file or directory: '<buildir>/TelepathyLoggerQt/_gen/spec-logger.xml'".

Test Plan

Builds fine with cmake 3.9

Diff Detail

R476 Telepathy Logger Qt bindings
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.
heikobecker created this revision.Aug 16 2017, 5:31 PM
akulichalexandr added a subscriber: akulichalexandr.

LGTM, though I would like to have the two commits separately.

Take a note that the sources are hosted at for a while [1]. We'll keep fd.o repositories in sync, but encourage you to use the new one for issue and code submissions.


This revision is now accepted and ready to land.Aug 24 2017, 10:08 AM

Thanks for looking into this


why this change?

given we're still using qt5_get_moc_flags above?


I misread your comment.
Your point is absolutely valid — qt5_* -> qt_ macro renaming should go to an another commit.

Split commits, adjusted commit message accordingly and removed
accidentally included part.

heikobecker marked an inline comment as done.Aug 24 2017, 10:40 AM
heikobecker added inline comments.

Upstream t-l-qt differ there and I accidentally included it. It was renamed from 'qt' to 'qt5' in t-l-q with commit: 594d2c32c1bd088e98f32a4b88500b5f4ffdc7e1

heikobecker marked 4 inline comments as done.Aug 24 2017, 10:41 AM
This revision was automatically updated to reflect the committed changes.