Differential D7352

Import upstream changes to TpQtMacros.cmake
ClosedPublic
Actions

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

Details

Reviewers
akulichalexandr
Group Reviewers
KDE Telepathy
Commits
R476:84104c2db098: Import upstream change to fix build with cmake 3.9
Summary

This adds two commits from
git://anongit.freedesktop.org/telepathy/telepathy-qt:

  • 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

Repository
R476 Telepathy Logger Qt bindings
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
heikobecker created this revision.Aug 16 2017, 5:31 PM
akulichalexandr accepted this revision as: akulichalexandr.Aug 24 2017, 10:08 AM
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 https://github.com/TelepathyIM/telepathy-qt 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.

[1] https://www.mail-archive.com/telepathy@lists.freedesktop.org/msg06582.html

This revision is now accepted and ready to land.Aug 24 2017, 10:08 AM
davidedmundson added a subscriber: davidedmundson.Aug 24 2017, 10:12 AM

Thanks for looking into this

cmake/modules/TpQtMacros.cmake
181

why this change?

given we're still using qt5_get_moc_flags above?

akulichalexandr added inline comments.Aug 24 2017, 10:22 AM
cmake/modules/TpQtMacros.cmake
181

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

heikobecker updated this revision to Diff 18663.Aug 24 2017, 10:38 AM

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.
cmake/modules/TpQtMacros.cmake
181

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
Closed by commit R476:84104c2db098: Import upstream change to fix build with cmake 3.9 (authored by heikobecker). · Explain WhyAug 24 2017, 10:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcmake/modules/TpQtMacros.cmake (12 lines)

Diff 18663

View Options

cmake/modules/TpQtMacros.cmake

Loading...