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

List:       kde-commits
Subject:    playground/base/plasma/applets
From:       Laurent Montel <montel () kde ! org>
Date:       2008-01-07 8:44:40
Message-ID: 1199695480.045368.3589.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 758221 by mlaurent:

Move libplasmaclock in kdebase


 M  +13 -4     CMakeLists.txt  
 M  +0 -2      fuzzy-clock/CMakeLists.txt  
 D             libplasmaclock (directory)  
 M  +0 -4      train-clock/CMakeLists.txt  


--- trunk/playground/base/plasma/applets/CMakeLists.txt #758220:758221
@@ -1,5 +1,4 @@
 #add_subdirectory(desktop)
-add_subdirectory(libplasmaclock)
 add_subdirectory(cia.vc)
 #add_subdirectory(flickrUpload)
 add_subdirectory(network)
@@ -10,7 +9,19 @@
 
 add_subdirectory(fortune-teller)
 
-add_subdirectory(train-clock)
+FIND_PATH(PLASMACLOCK_INCLUDE
+  NAMES
+  ui_calendar.h
+  PATHS
+  ${KDE4_INCLUDE_DIR}
+  ${INCLUDE_INSTALL_DIR}
+)
+
+if(PLASMACLOCK_INCLUDE)
+  add_subdirectory(train-clock)
+  add_subdirectory(fuzzy-clock)
+endif(PLASMACLOCK_INCLUDE)
+
 add_subdirectory(nowplaying)
 
 if(PLASMA_OPENGL_FOUND)
@@ -39,8 +50,6 @@
 
 add_subdirectory(binary-clock)
 
-add_subdirectory(fuzzy-clock)
-
 add_subdirectory(calculator)
 
 add_subdirectory(showdesktop)
--- trunk/playground/base/plasma/applets/fuzzy-clock/CMakeLists.txt #758220:758221
@@ -1,7 +1,5 @@
 project(plasma-fuzzy-clock)
 
-include_directories (${CMAKE_CURRENT_BINARY_DIR}/../libplasmaclock)
-
 set(fuzzyclock_SRCS
     fuzzyClock.cpp)
 
--- trunk/playground/base/plasma/applets/train-clock/CMakeLists.txt #758220:758221
@@ -1,9 +1,5 @@
 project(plasma-train-clock)
 
-#temporary
-include_directories( ../libplasmaclock/
-${CMAKE_CURRENT_BINARY_DIR}/../libplasmaclock/)
-
 set(clock_SRCS
     clock.cpp)
 
[prev in list] [next in list] [prev in thread] [next in thread]