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

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

SVN commit 758220 by mlaurent:

Move libplasmaclock from playground.
=> share code with clock applets.


 M  +1 -0      CMakeLists.txt  
 M  +5 -2      digital-clock/CMakeLists.txt  
 D             digital-clock/calendar.ui  
 A             libplasmaclock (directory)   trunk/playground/base/plasma/applets/libplasmaclock#758210
 M  +2 -1      libplasmaclock/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/plasma/applets/CMakeLists.txt #758219:758220
@@ -1,3 +1,4 @@
+add_subdirectory(libplasmaclock)
 add_subdirectory(analog-clock)
 add_subdirectory(battery)
 add_subdirectory(digital-clock)
--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/CMakeLists.txt #758219:758220
@@ -1,12 +1,15 @@
 project(plasma-dig-clock)
 
+include_directories( ../libplasmaclock/
+${CMAKE_CURRENT_BINARY_DIR}/../libplasmaclock/)
+
 set(clock_SRCS
     clock.cpp)
 
 kde4_add_ui_files(clock_SRCS clockConfig.ui )
-kde4_add_ui_files(clock_SRCS calendar.ui )
+kde4_add_ui_files(clock_SRCS )
 kde4_add_plugin(plasma_applet_dig_clock ${clock_SRCS})
-target_link_libraries(plasma_applet_dig_clock plasma ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_applet_dig_clock plasma plasmaclock ${KDE4_KDEUI_LIBS})
 
 install(TARGETS plasma_applet_dig_clock DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-digitalclock.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- trunk/KDE/kdebase/workspace/plasma/applets/libplasmaclock/CMakeLists.txt #758210:758220
@@ -12,5 +12,6 @@
 set_target_properties(plasmaclock PROPERTIES VERSION ${GENERIC_LIB_VERSION}
 SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-install(FILES clocknumber.h plasmaclock_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/)
+install(FILES clocknumber.h plasmaclock_export.h
+${CMAKE_CURRENT_BINARY_DIR}/ui_calendar.h DESTINATION ${INCLUDE_INSTALL_DIR}/)
 install(TARGETS plasmaclock  DESTINATION ${LIB_INSTALL_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]