[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: KDE/kdepim
From:       Allen Winter <winter () kde ! org>
Date:       2009-10-05 11:16:00
Message-ID: 200910050716.00824.winter () kde ! org
[Download RAW message or body]

On Monday 05 October 2009 6:42:47 am Christophe Giboudeaux wrote:
> Hi,
> 
> On Saturday 03 October 2009 22:45:12 Allen Winter wrote:
> > SVN commit 1031046 by winterz:
> > 
> > we set KMAIL_SUPPORTED if we are building KMail.  which is good.
> > however we never added KMAIL_SUPPORTED to the defined compiler macros. 
> >  which is bad.
> > 
> > Now that we define KMAIL_SUPPORTED, we can actually see a list of accounts
> >  to synchronize in the "Sync All" tool submenu.
> > 
> > MERGE: e4,4.3
> > 
> > 
> >  M  +1 -0      CMakeLists.txt
> > 
> > 
> > --- trunk/KDE/kdepim/CMakeLists.txt #1031045:1031046
> > @@ -184,6 +184,7 @@
> >      macro_optional_add_subdirectory(kmail)
> >      # If kmail is compiled, KMAIL_SUPPORTED is true (used in several
> >  places) macro_bool_to_01(BUILD_kmail KMAIL_SUPPORTED)
> > +    add_definitions(-DKMAIL_SUPPORTED)
> 
> mmh, This will also add the -DKMAIL_SUPPORTED definition if QGPGME_FOUND is 
> true but KMail isn't built.
> 
hmm.. right. that isn't good.

> afaics, KMAIL_SUPPORTED is #ifdef'd only in two places: kalarm and the summary 
> plugin. 
> 
> What about this instead (in kontact/src/plugins/summary/CMakeLists.txt) :
> 
> if(KMAIL_SUPPORTED)
>   add_definitions(-DKMAIL_SUPPORTED)
> endif(KMAIL_SUPPORTED)
> 
Fine with me.  Do that in kalarm/CMakeLists.txt too?
This seems hard to maintain though.

doing the add_definitiions() in the top-level CMakeLists.txt seems easier to maintain.
[prev in list] [next in list] [prev in thread] [next in thread]