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

List:       kde-commits
Subject:    Re: KDE/kdepim/kalarm/akonadi
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-07-25 13:33:33
Message-ID: 201007251433.43163.djarvie () kde ! org
[Download RAW message or body]


On Saturday 24 July 2010 02:40:14 Christophe Giboudeaux wrote:
> Hi,
> 
> Le 23/07/2010 21:16, David Jarvie a écrit :
> > SVN commit 1153686 by djarvie:
> > 
> > Add option to locate this build under runtime/resources/ical/.
> > Akonadi doesn't work fully if built under kalarm/
> > 
> > 
> > M  +19 -5     CMakeLists.txt  
> > 
> > 
> > --- trunk/KDE/kdepim/kalarm/akonadi/CMakeLists.txt #1153685:1153686
> > @@ -1,7 +1,15 @@
> > -########### definitions copied from akonadi/ ###############
> > -set(AKONADI_SHARED_RESOURCES ${CMAKE_SOURCE_DIR}/runtime/resources/shared)
> > +# Set location of this directory:
> > +#   LOCAL_BUILD = TRUE if kdepim/kalarm/akonadi,
> > +#               = FALSE if kdepim/runtime/resources/ical/alarms
> > +set(LOCAL_BUILD TRUE)
> > +if (LOCAL_BUILD)
> > +    # Note that resource configuration dialogs don't appear if built with this \
> > option. +    set(KALARM_CALENDAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/kalarm/cal)
> > set(AKONADI_ICAL_RESOURCE ${CMAKE_SOURCE_DIR}/runtime/resources/ical)
> > 
> > +    ########### definitions copied from runtime/ ###############
> > +    set(AKONADI_SHARED_RESOURCES ${CMAKE_SOURCE_DIR}/runtime/resources/shared)
> > +
> 
> Just a reminder:
> 
> kdepim and kdepim-runtime are shipped in different tarballs and should
> be considered as two different modules.
> 
> The kalarm build will fail when kdepim moves to git (where kdepim-apps
> and kdepim-runtime should hopefully be separated).

Yes, thanks, I'm aware of this - the location option in CMakeLists.txt is just an aid \
to testing until the Akonadi version works properly and can be moved to the proper \
location. Currently I have to copy the code locally between the two locations, and \
having both options in CMakeLists.txt avoids cmake code getting lost.

-- 
David Jarvie.
KDE developer.
KAlarm author -- http://www.astrojar.org.uk/kalarm


["signature.asc" (application/pgp-signature)]

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