[Bug 24648] Merge cmake support
bugzilla-daemon at freedesktop.org
bugzilla-daemon at freedesktop.org
Fri Apr 16 21:47:17 CEST 2010
https://bugs.freedesktop.org/show_bug.cgi?id=24648
--- Comment #2 from Dario Freddi <drf54321 at gmail.com> 2010-04-16 12:47:17 PDT ---
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.
--
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.
More information about the telepathy-bugs
mailing list