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

List:       kde-commits
Subject:    KDE/kdepim/kalarm/akonadi
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-07-23 19:16:51
Message-ID: 20100723191651.BCA74AC852 () svn ! kde ! org
[Download RAW message or body]

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)
+
 set( AKONADI_SINGLEFILERESOURCE_SHARED_SOURCES
   ${AKONADI_SHARED_RESOURCES}/singlefileresourcebase.cpp
   ${AKONADI_SHARED_RESOURCES}/singlefileresourceconfigwidget.cpp
@@ -19,11 +27,17 @@
   ${CMAKE_SOURCE_DIR}/runtime/resources/shared/singlefileresourceconfigdialog.ui
 )
 endif (KDEPIM_MOBILE_UI)
-########### end definitions copied from akonadi/ ###############
+    ########### end definitions copied from runtime/ ###############
+else (LOCAL_BUILD)
+    set(KALARM_CALENDAR_INCLUDE_DIR cal)
+    set(AKONADI_ICAL_RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
+    add_definitions(-DUSE_AKONADI)
+    add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5950)
+endif (LOCAL_BUILD)
+
 include_directories(
-    .
-    ${CMAKE_SOURCE_DIR}/kalarm/cal
+    ${KALARM_CALENDAR_INCLUDE_DIR}
     ${AKONADI_ICAL_RESOURCE}
     ${AKONADI_SHARED_RESOURCES}
     ${QT_QTDBUS_INCLUDE_DIR}
[prev in list] [next in list] [prev in thread] [next in thread]