ian at monroe.nu
Mon Mar 21 01:22:49 GMT 2011
On Sun, Mar 20, 2011 at 12:26, Alexander Neundorf <neundorf at kde.org> wrote:
> On Sunday 13 March 2011, Harald Sitter wrote:
>> On Sat, Mar 12, 2011 at 9:11 PM, Alexander Neundorf <neundorf at kde.org>
>> >> phonon-buildsystem is only used to build the backends. Applications
>> >> should *not* be using the stuff in there. If they manage to find
>> >> FindPhonon.cmake from phonon-buildsystem, the application's build has a
>> >> bug. Our FindPhonon.cmake looks for FindPhononInternal.cmake, which adds
>> >> some build magic for the backends, such as telling them we have
>> >> pulseaudio support, where to install the backend library, and some
>> >> standard compilation flags across all backends.
>> > FindKDE4Internal.cmake was done in cmake 2.4.0 times.
>> > Since cmake 2.6.0 cmake supports finding XXXConfig.cmake files, installed
>> > in lib/cmake/XXX/.
>> > So you could install a PhononConfig.cmake file, which contains all the
>> > information you want. This file will be found directly by cmake, and it
>> > will be "cmake-conform", no messing around with pkg-config.
>> > I would strongly recommend to do this.
>> > The pages here: http://www.vtk.org/Wiki/CMake/Tutorials explain how to do
>> > this.
>> There is a branch for that (SaroEngels was working on it), never got
>> merged thought *shrug*.
> Sorry, stupid git questions follow:
> why doesn't "git branch" show me this branch ?
> I did a git pull now, which said
> Resolving deltas: 100% (192/192), completed with 62 local objects.
> From git://anongit.kde.org/phonon
> d53377a..f902a8f cmake_tng -> origin/cmake_tng
> * [new branch] kio-by-default -> origin/kio-by-default
> 83eda0a..3fbf916 master -> origin/master
> * [new branch] no-automoc -> origin/no-automoc
> * [new branch] systemtap -> origin/systemtap
> 8cea8fc..6d4ad57 threaded-streaming -> origin/threaded-streaming
> Updating 83eda0a..3fbf916
> So I tried "git checkout origin/cmake_tng", which told me other weird things:
> hammer:~/src/kde-git/kdesupport/phonon$ git checkout origin/cmake_tng
> Note: moving to 'origin/cmake_tng' which isn't a local branch
> If you want to create a new branch from this checkout, you may do so
> (now or later) by using -b with the checkout command again. Example:
> git checkout -b <new_branch_name>
> HEAD is now at f902a8f... Merge branch 'cmake_tng' of git.kde.org:phonon into
> What do I make out of this ?
That you should head into #kde-git and ask for some help learning git
branches if you haven't already. :)
More information about the kde-multimedia