From cff541acfef717aae4c9b696627b4817e7eac851 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 24 Apr 2014 11:04:55 -0500
Subject: rename 'clock-watcher' as 'alarm-queue' because the former name isn't
 very informative.

---
 src/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9bc22f2..6b65ebc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,10 +10,10 @@ add_definitions (-DTIMEZONE_FILE="/etc/timezone"
 add_library (${SERVICE_LIB} STATIC
              actions.cpp
              actions-live.cpp
+             alarm-queue.cpp
              appointment.cpp
              clock.cpp
              clock-live.cpp
-             clock-watcher.cpp
              date-time.cpp
              engine-eds.cpp
              exporter.cpp
-- 
cgit v1.2.3


From a396e6af3cd16530202f6cbecbd45c7a3f6ac893 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 24 Apr 2014 22:34:42 -0500
Subject: hw alarms

---
 src/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b65ebc..924e538 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions (-DTIMEZONE_FILE="/etc/timezone"
 add_library (${SERVICE_LIB} STATIC
              actions.cpp
              actions-live.cpp
-             alarm-queue.cpp
+             alarm-queue-simple.cpp
              appointment.cpp
              clock.cpp
              clock-live.cpp
@@ -30,7 +30,9 @@ add_library (${SERVICE_LIB} STATIC
              timezone-file.cpp
              timezone-geoclue.cpp
              timezones-live.cpp
-             utils.c)
+             utils.c
+             wakeup-timer-uha.cpp
+             wakeup-timer-mainloop.cpp)
 include_directories (${CMAKE_SOURCE_DIR})
 link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 
-- 
cgit v1.2.3


From 3f7fad001e4fe74a89b60d2e217750baaf3b0392 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 10 Jun 2014 23:04:52 -0500
Subject: Don't build the hw-alarms pieces if ubuntu/hardware/alarm.h can't be
 found. Don't require libplatform-hardware-api-* unless the arch is armhf,
 i386, or amd64.

---
 src/CMakeLists.txt | 57 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 924e538..ffa1523 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,32 +7,37 @@ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS} ${GCO
 add_definitions (-DTIMEZONE_FILE="/etc/timezone"
                  -DG_LOG_DOMAIN="Indicator-Datetime")
 
-add_library (${SERVICE_LIB} STATIC
-             actions.cpp
-             actions-live.cpp
-             alarm-queue-simple.cpp
-             appointment.cpp
-             clock.cpp
-             clock-live.cpp
-             date-time.cpp
-             engine-eds.cpp
-             exporter.cpp
-             formatter.cpp
-             formatter-desktop.cpp
-             locations.cpp
-             locations-settings.cpp
-             menu.cpp
-             planner-month.cpp
-             planner-range.cpp
-             planner-upcoming.cpp
-             settings-live.cpp
-             snap.cpp
-             timezone-file.cpp
-             timezone-geoclue.cpp
-             timezones-live.cpp
-             utils.c
-             wakeup-timer-uha.cpp
-             wakeup-timer-mainloop.cpp)
+set (SERVICE_SOURCES
+     actions.cpp
+     actions-live.cpp
+     alarm-queue-simple.cpp
+     appointment.cpp
+     clock.cpp
+     clock-live.cpp
+     date-time.cpp
+     engine-eds.cpp
+     exporter.cpp
+     formatter.cpp
+     formatter-desktop.cpp
+     locations.cpp
+     locations-settings.cpp
+     menu.cpp
+     planner-month.cpp
+     planner-range.cpp
+     planner-upcoming.cpp
+     settings-live.cpp
+     snap.cpp
+     timezone-file.cpp
+     timezone-geoclue.cpp
+     timezones-live.cpp
+     utils.c
+     wakeup-timer-mainloop.cpp)
+
+if (HAVE_UBUNTU_HW_ALARM_H)
+  set (SERVICE_SOURCES ${SERVICE_SOURCES} wakeup-timer-uha.cpp)
+endif ()
+
+add_library (${SERVICE_LIB} STATIC ${SERVICE_SOURCES})
 include_directories (${CMAKE_SOURCE_DIR})
 link_directories (${SERVICE_DEPS_LIBRARY_DIRS})
 
-- 
cgit v1.2.3