kdesupport/decibel

[Dominik Haumann]

On Monday 10 November 2008, Matthew Woehlke wrote:
> Dominik Haumann wrote:
> > Please CC me, as I'm not subscribed to kde-buildsystem.
>
> Likewise, I'm on kde-buildsystem but not decibel, please CC either me or
> buildsystem.
>
> > On Saturday 08 November 2008, Dominik Haumann wrote:
> >> SVN commit 881692 by dhaumann:
> >>
> >> fix building Decibel as submodule of kdesupport
> >
> > [...]
>
> Hey, you fixed my RFE! (https://bugs.kde.org/show_bug.cgi?id=169632)
>
> Can I commit this small adjustment also?
>
> Index: decibel/CMakeLists.txt
> ===================================================================
> --- decibel/CMakeLists.txt      (revision 882361)
> +++ decibel/CMakeLists.txt      (working copy)
> @@ -2,7 +2,7 @@
>   CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
>   cmake_policy(SET CMP0003 NEW)
>
> -set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
> +SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})

I don't see a reason to not commit it, although not all modules in
kdesupport do it:
not setting it: akonadi decibel eigen2 kdewin32 kdewin-installer phonon qca strigi
setting it: eigen qimageblitz soprano tapioca

> Oh, and I have an outstanding note to use KDESupport_SOURCE_DIR in the
> Find modules for FindTapioca and FindTelepathy... which I see is done
> already in decibel but not tapioca; along with the above, okay to copy
> FindTelepathyQt.cmake from decibel to tapioca, replacing the current
> version?

Tapioca is doing it differently right now (tapioca-qt/CMakeLists.txt):

if(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
   set(TELEPATHY_QT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/telepathy-qt/include)
   set(TELEPATHY_QT_LIBRARIES QtTelepathyClient)
else(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
   FIND_PACKAGE(TelepathyQt REQUIRED)
endif(EXISTS ${CMAKE_SOURCE_DIR}/telepathy-qt/)
if (NOT QT_QTDBUS_FOUND)
   message(FATAL_ERROR  "Tapioca-Qt requires Qt4 with QtDBus module in order to built.")
endif(NOT QT_QTDBUS_FOUND)

So this part is handeled in the CMakeLists.txt file atm, not consistent, but
it works. If you want, you can fix it as you described, should work out of
the bux. But please test :)

Thanks,
Dominik