Permalink
Browse files

Merge branch 'WorldClock'

  • Loading branch information...
2 parents bcabb6c + 8964e36 commit b19af9bf64d1d0f62eb85ce93290bae8ef08a37b @kuzmas kuzmas committed Nov 17, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,8 +1,5 @@
project(libsysstat)
-# additional cmake files
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
set (MAJOR_VERSION 0)
set (MINOR_VERSION 1)
set (PATCH_VERSION 0)
@@ -39,8 +39,9 @@ setByDefault(VOLUME_PLUGIN Yes)
setByDefault(VOLUME_USE_PULSEAUDIO Yes)
setByDefault(VOLUME_USE_ALSA Yes)
-setByDefault(KBINDICATOR_PLUGIN Yes)
setByDefault(SYSSTAT_PLUGIN Yes)
+setByDefault(KBINDICATOR_PLUGIN Yes)
+setByDefault(WORLDCLOCK_PLUGIN Yes)
# *******************************************************************
@@ -205,6 +206,20 @@ if (SYSSTAT_PLUGIN)
add_subdirectory(plugin-sysstat)
endif (SYSSTAT_PLUGIN)
+if (WORLDCLOCK_PLUGIN)
+ FIND_PACKAGE(ICU 2.8 REQUIRED i18n data)
+
+ if(ICU_I18N_FOUND)
+ set(ENABLED_PLUGINS ${ENABLED_PLUGINS} "WorldClock")
+ add_subdirectory(plugin-worldclock)
+ else ()
+ message(STATUS "")
+ message(STATUS "WorldClock plugin requires ICU")
+ message(STATUS "")
+ endif (ICU_I18N_FOUND)
+
+endif (WORLDCLOCK_PLUGIN)
+
message(STATUS "**************** The following plugins will be built ****************")
foreach (PLUGIN_STR ${ENABLED_PLUGINS})
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 2.6)
+
+set(PLUGIN "panelworldclock")
+
+
+set(HEADERS
+ razorworldclock.h
+ razorworldclockconfiguration.h
+ razorworldclockconfigurationtimezones.h
+)
+
+set(SOURCES
+ razorworldclock.cpp
+ razorworldclockconfiguration.cpp
+ razorworldclockconfigurationtimezones.cpp
+)
+
+set(MOCS
+ razorworldclock.h
+ razorworldclockconfiguration.h
+ razorworldclockconfigurationtimezones.h
+)
+
+set(UIS
+ razorworldclockconfiguration.ui
+ razorworldclockconfigurationtimezones.ui
+)
+
+
+include_directories(${ICU_INCLUDE_DIRS})
+LINK_LIBRARIES(${PLUGIN} ${ICU_LIBRARIES})
+
+#*******************************************
+include ("../BuildPlugin.cmake")
+BUILD_RAZOR_PLUGIN(${PLUGIN})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
Oops, something went wrong.

0 comments on commit b19af9b

Please sign in to comment.