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

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-04-28 18:38:25
Message-ID: 20100428183825.C5958AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1120268 by djarvie:

Explicitly disable akonadi for now


 M  +5 -7      CMakeLists.txt  


--- trunk/KDE/kdepim/kalarm/CMakeLists.txt #1120267:1120268
@@ -2,11 +2,14 @@
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5950)
 
-#set(BUILD_akonadi TRUE)
+# KAlarm depends on kdepim/akonadi/ which is impossible for packagers.
+# Akonadi for KAlarm doesn't work yet.
+set(BUILD_akonadi FALSE)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 if(BUILD_akonadi)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS} -DUSE_AKONADI")
+else(BUILD_akonadi)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 endif(BUILD_akonadi)
 
 
@@ -21,14 +24,9 @@
 ) 
 
 add_subdirectory( cal ) 
-
-# KAlarm depends on kdepim/akonadi/ which is impossible for packagers.
-# The Akonadi resource for KAlarm won't be available in KDE 4.4
 if(BUILD_akonadi)
-# Disable for KDE 4.4 since it doesn't work yet
   add_subdirectory( akonadi )
 endif(BUILD_akonadi)
-
 add_subdirectory( resources ) 
 add_subdirectory( appicons ) 
 add_subdirectory( pixmaps ) 
[prev in list] [next in list] [prev in thread] [next in thread]