From f92e2316665c75ed44f1c662cf7aa62fcbf6d419 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Tue, 25 Sep 2012 18:18:53 +0200
Subject: Add CMakeLists.txt for control GUI

---
 tools/gui/CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tools/gui/CMakeLists.txt

(limited to 'tools/gui/CMakeLists.txt')

diff --git a/tools/gui/CMakeLists.txt b/tools/gui/CMakeLists.txt
new file mode 100644
index 0000000..39afe98
--- /dev/null
+++ b/tools/gui/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_definitions("--std=c99 -Wall")
+
+# --- Find packages and libraries ---------------------------------------------
+find_package(PkgConfig)
+
+pkg_check_modules(GTK2 gtk+-2.0>=2.22)
+pkg_check_modules(GTHREAD2 gthread-2.0)
+pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED)
+pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade ${CMAKE_CURRENT_BINARY_DIR})
+
+# --- Build targets -----------------------------------------------------------
+include_directories(
+    ${GLIB2_INCLUDE_DIRS}
+    ${GOBJECT2_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}/../../src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    )
+
+if (GTK2_FOUND)
+    include_directories(${GTK2_INCLUDE_DIRS})
+
+    add_executable(control
+        control.c
+        egg-property-cell-renderer.c
+        egg-property-tree-view.c)
+
+    target_link_libraries(control uca
+        ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
+
+    install(TARGETS control
+        RUNTIME DESTINATION bin)
+
+    install(FILES control.glade
+        DESTINATION share/libuca)
+endif()
-- 
cgit v1.2.3


From 08a794b59a02a36028da90f31e165e7f44ef28e5 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Wed, 10 Oct 2012 09:15:21 +0200
Subject: Add histogram view skeleton

---
 tools/gui/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/gui/CMakeLists.txt')

diff --git a/tools/gui/CMakeLists.txt b/tools/gui/CMakeLists.txt
index 39afe98..b30f3ea 100644
--- a/tools/gui/CMakeLists.txt
+++ b/tools/gui/CMakeLists.txt
@@ -26,7 +26,8 @@ if (GTK2_FOUND)
     add_executable(control
         control.c
         egg-property-cell-renderer.c
-        egg-property-tree-view.c)
+        egg-property-tree-view.c
+        egg-histogram-view.c)
 
     target_link_libraries(control uca
         ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
-- 
cgit v1.2.3


From 6200956f93eabb0fe040902fda3716b676b2921a Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Thu, 11 Oct 2012 08:45:56 +0200
Subject: Link explicitly against libm

---
 tools/gui/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tools/gui/CMakeLists.txt')

diff --git a/tools/gui/CMakeLists.txt b/tools/gui/CMakeLists.txt
index b30f3ea..ff5e9f6 100644
--- a/tools/gui/CMakeLists.txt
+++ b/tools/gui/CMakeLists.txt
@@ -30,7 +30,9 @@ if (GTK2_FOUND)
         egg-histogram-view.c)
 
     target_link_libraries(control uca
-        ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
+        ${GTK2_LIBRARIES} 
+        ${GTHREAD2_LIBRARIES}
+        m)
 
     install(TARGETS control
         RUNTIME DESTINATION bin)
-- 
cgit v1.2.3


From ef7ff789e9c15f4f4b8c65585de7e7fa4f9c9438 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 12 Oct 2012 14:47:07 +0200
Subject: Add ring buffer recording for assessment

---
 tools/gui/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools/gui/CMakeLists.txt')

diff --git a/tools/gui/CMakeLists.txt b/tools/gui/CMakeLists.txt
index ff5e9f6..1000ac6 100644
--- a/tools/gui/CMakeLists.txt
+++ b/tools/gui/CMakeLists.txt
@@ -25,6 +25,7 @@ if (GTK2_FOUND)
 
     add_executable(control
         control.c
+        ring-buffer.c
         egg-property-cell-renderer.c
         egg-property-tree-view.c
         egg-histogram-view.c)
-- 
cgit v1.2.3