Bug 24648 - Merge cmake support
Summary: Merge cmake support
Status: RESOLVED FIXED
Alias: None
Product: Telepathy
Classification: Unclassified
Component: tp-qt (show other bugs)
Version: unspecified
Hardware: Other All
: medium normal
Assignee: Telepathy bugs list
QA Contact: Telepathy bugs list
URL: http://git.collabora.co.uk/?p=user/an...
Whiteboard:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2009-10-20 13:49 UTC by Andre Moreira Magalhaes
Modified: 2010-10-01 06:53 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
Patch 1/3 (23.19 KB, patch)
2010-04-24 06:20 UTC, Dario Freddi
Details | Splinter Review
Patch 2/3 (10.55 KB, patch)
2010-04-24 06:21 UTC, Dario Freddi
Details | Splinter Review
Patch 3/3 (10.53 KB, patch)
2010-04-24 06:21 UTC, Dario Freddi
Details | Splinter Review

Description Andre Moreira Magalhaes 2009-10-20 13:49:46 UTC
Merge cmake support upstream
Comment 1 Andre Moreira Magalhaes 2010-04-15 13:59:48 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
Comment 2 Dario Freddi 2010-04-16 12:47:17 UTC
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.
Comment 3 Dario Freddi 2010-04-24 06:20:36 UTC
Created attachment 35268 [details] [review]
Patch 1/3
Comment 4 Dario Freddi 2010-04-24 06:21:08 UTC
Created attachment 35269 [details] [review]
Patch 2/3
Comment 5 Dario Freddi 2010-04-24 06:21:35 UTC
Created attachment 35270 [details] [review]
Patch 3/3
Comment 6 Dario Freddi 2010-04-24 06:22:43 UTC
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 7 Dario Freddi 2010-06-03 00:15:41 UTC
Comment on attachment 35268 [details] [review]
Patch 1/3

Making patch obsolete as it has been merged into Andre's branch.
Comment 8 Dario Freddi 2010-06-03 00:15:53 UTC
Comment on attachment 35269 [details] [review]
Patch 2/3

Making patch obsolete as it has been merged into Andre's branch.
Comment 9 Dario Freddi 2010-06-03 00:16:03 UTC
Comment on attachment 35270 [details] [review]
Patch 3/3

Making patch obsolete as it has been merged into Andre's branch.
Comment 10 Dario Freddi 2010-10-01 05:39:41 UTC
Support has been merged to upstream master
Comment 11 Dario Freddi 2010-10-01 06:53:34 UTC
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.