using phonon from kde-qt repo

[Pavel Volkovitskiy]

Hello!

i'm trying to build latest kdebase-runtime module from 4.3 branch with
phonon from qt (kde-qt repo) instead of kdesupport

cmake finds headers/libraries but then build stops with:

phonon/kded-module/phononserver.h:26:36: error: Phonon/ObjectDescription: No
such file or directory

i tried to fix that and found that FindQt4.cmake (from kdelibs) doesn't set
QT_PHONON_INCLUDE_DIR right (ie it doesn't finds headers)

this patch fixes that:
===========================================================
--- FindQt4.cmake.orig  2009-07-27 21:59:42.670907643 +0400
+++ FindQt4.cmake       2009-07-27 22:14:37.585907753 +0400
@@ -739,9 +739,10 @@
     )

   # Set QT_PHONON_INCLUDE_DIR
-  FIND_PATH(QT_PHONON_INCLUDE_DIR phonon
+  FIND_PATH(QT_PHONON_INCLUDE_DIR Phonon
     PATHS
     ${QT_INCLUDE_DIR}/phonon
+    ${QT_HEADERS_DIR}/phonon
     NO_DEFAULT_PATH
     )
===========================================================

i added QT_HEADERS_DIR just to match others QT_.*_INCLUDE_DIR

real issue is that it's looked for "phonon" but only "Phonon" exists there

-- 
Pavel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/kde-buildsystem/attachments/20090728/200441e4/attachment.htm