KDE/kdelibs/cmake/modules

[Andreas Hartmetz]

On Sunday 04 October 2009 17:31:38 Alexander Neundorf wrote:
> On Saturday 03 October 2009, Andreas Hartmetz wrote:
> > SVN commit 1031058 by ahartmetz:
> >
> > Fix / adapt to FindQt4.cmake changes. Found the error in kdenetwork which
> > uses reeeally old ui files.
> > CCMAIL: kde-buildsystem at kde.org
> > CCMAIL: neundorf at kde.org
> >
> >
> >  M  +1 -1      KDE4Macros.cmake
> >
> >
> > --- trunk/KDE/kdelibs/cmake/modules/KDE4Macros.cmake #1031057:1031058
> > @@ -159,7 +159,7 @@
> >  #usage: KDE4_ADD_UI3_FILES(foo_SRCS ${ui_files})
> >  macro (KDE4_ADD_UI3_FILES _sources )
> >
> > -   qt4_get_moc_inc_dirs(_moc_INCS)
> > +   qt4_get_moc_flags(_moc_INCS)
> 
> Hmm, what do we do here...
> qt4_get_moc_inc_dirs() and also qt4_get_moc_flags() were intended to be
> internal macros, i.e. not used outside FindQt4.cmake (that's why they are
>  not documented).
> Now there is actually a file which uses this internal macro.
> So, what do we do ?
> Live with the changed name and assume that the one change in
>  KDE4Macros.cmake is the only outside user, and for everybody else it's his
>  own fault if he uses internal stuff ?
> 
> Or should I just add a wrapper macro with the old name, so stuff which uses
> this internal macro stays working ?
> 
> Alex
> 
As somebody who is not very involved or knowledgeable in cmake-ish things, I 
am in favor of the first option: whoever uses internal macros is doing it 
wrong. Not nice that KDE4Macros.cmake does it wrong, so what.
Does someone you see a way to avoid using qt4_get_moc_flags? It seems that only 
the macro for UI3 files uses it, UI4 files seem to work without the forbidden 
macro... at least I had no error to fix there.