Summary: | Merge cmake support | ||
---|---|---|---|
Product: | Telepathy | Reporter: | Andre Moreira Magalhaes <andrunko> |
Component: | tp-qt | Assignee: | Telepathy bugs list <telepathy-bugs> |
Status: | RESOLVED FIXED | QA Contact: | Telepathy bugs list <telepathy-bugs> |
Severity: | normal | ||
Priority: | medium | CC: | drf54321 |
Version: | unspecified | Keywords: | patch |
Hardware: | Other | ||
OS: | All | ||
URL: | http://git.collabora.co.uk/?p=user/andrunko/telepathy-qt4.git;a=shortlog;h=refs/heads/cmake | ||
Whiteboard: | |||
i915 platform: | i915 features: | ||
Attachments: |
Patch 1/3
Patch 2/3 Patch 3/3 |
Description
Andre Moreira Magalhaes
2009-10-20 13:49:46 UTC
Anyone up to review this. Me and dario and other tp-kde devs are using this branch for a while and it's working so far. I believe it's ready for review Reviewed and fixed some stuff. I pushed the fixes to my private branch, http://git.collabora.co.uk/?p=user/drf/telepathy-qt4.git;a=summary 1. Find package routine - the code was calling pkg-config directly, which is not a good idea in CMake land. Instead, I moved them to a Find*.cmake file, and handled all the relevant stuff over there. I had to find additional modules (Glib, DBus, LibXml) to satisfy include directories dependency. This is lying in commit 8fa9f4a45adf49d75198c878a64c705cb5ef95ab. 2. There are some optional packages used to activate some features: to grant a better build experience, use the neat macro_feature_log(), which makes the whole optional package round nicer and more detailed. Find it in commit ffdf5783799741c0ef6379a9815075486880f7b4. 3. Remove useless include_directories(): CMake automatically cascades include_directories() to subdirectories; before this commit, there were a lot of duplicated entry which actually did nothing at all. This is fixed in commit 89cbe336fc5fb05e817028b1b5da02427c503a3e. 4. There are some autotools leftovers: the m4 directory, and Makefile.am all over the place. Before merging the branch, I'd remove them first. Andre, I leave the decision (and the eventual commit) to you :) More than that, it looks ready to go to me. Created attachment 35268 [details] [review] Patch 1/3 Created attachment 35269 [details] [review] Patch 2/3 Created attachment 35270 [details] [review] Patch 3/3 I attached the three patches here, as I'm rebasing my branch against yours and commit hashes change - also I fixed some whitespaces errors and improved FindGLIB2.cmake. Comment on attachment 35268 [details] [review] Patch 1/3 Making patch obsolete as it has been merged into Andre's branch. Comment on attachment 35269 [details] [review] Patch 2/3 Making patch obsolete as it has been merged into Andre's branch. Comment on attachment 35270 [details] [review] Patch 3/3 Making patch obsolete as it has been merged into Andre's branch. Support has been merged to upstream master Will be there from 0.3.11+ |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.