From 034204d3d8d1a32b1a20e50697c5f81db6fb20cf Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 31 Aug 2012 23:14:16 +0200
Subject: Initial plugin manager

---
 test/CMakeLists.txt | 90 ++++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ce45d71..8fe702b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,51 +36,51 @@ if (HAVE_PYLON_CAMERA)
     link_directories(${PYLON_LIB_DIRS} ${LIBPYLONCAM_LIBDIR})
 endif()
 
-add_executable(grab grab.c)
-add_executable(grab-async grab-async.c)
+#add_executable(grab grab.c)
+#add_executable(grab-async grab-async.c)
 add_executable(benchmark benchmark.c)
 
 target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-
-add_executable(grab_pylon grab_pylon.c)
-target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-
-if (NOT DEFINED WITH_CONTROL_GUI)
-    set(WITH_CONTROL_GUI TRUE)
-endif()
-
-if (GTK2_FOUND AND WITH_CONTROL_GUI)
-    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()
-
-if (HAVE_MOCK_CAMERA)
-    add_executable(test-mock test-mock.c)
-
-    target_link_libraries(test-mock
-        uca
-        ${GLIB2_LIBRARIES}
-        ${GOBJECT2_LIBRARIES})
-
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
-        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
-endif()
-
-add_executable(test-all test-all.c)
-target_link_libraries(test-all uca
-    ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+#target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+#target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+
+#add_executable(grab_pylon grab_pylon.c)
+#target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+#
+#if (NOT DEFINED WITH_CONTROL_GUI)
+#    set(WITH_CONTROL_GUI TRUE)
+#endif()
+#
+#if (GTK2_FOUND AND WITH_CONTROL_GUI)
+#    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()
+
+#if (HAVE_MOCK_CAMERA)
+#    add_executable(test-mock test-mock.c)
+#
+#    target_link_libraries(test-mock
+#        uca
+#        ${GLIB2_LIBRARIES}
+#        ${GOBJECT2_LIBRARIES})
+#
+#    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
+#        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
+#endif()
+
+#add_executable(test-all test-all.c)
+#target_link_libraries(test-all uca
+#    ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-- 
cgit v1.2.3


From 6dd3229337aa1920d266fbd2c4001fb7c65f5cf1 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Wed, 19 Sep 2012 18:04:32 +0200
Subject: Make most cameras plugins

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

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8fe702b..37ea6bf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -36,12 +36,12 @@ if (HAVE_PYLON_CAMERA)
     link_directories(${PYLON_LIB_DIRS} ${LIBPYLONCAM_LIBDIR})
 endif()
 
-#add_executable(grab grab.c)
+add_executable(grab grab.c)
 #add_executable(grab-async grab-async.c)
 add_executable(benchmark benchmark.c)
 
 target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-#target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
 #add_executable(grab_pylon grab_pylon.c)
-- 
cgit v1.2.3


From 10af0e5911e06d041874a3da7adafa3f21319def Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 21 Sep 2012 11:47:42 +0200
Subject: Port control GUI to use the plugin manager

---
 test/CMakeLists.txt | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 37ea6bf..651c805 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -51,23 +51,23 @@ target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #    set(WITH_CONTROL_GUI TRUE)
 #endif()
 #
-#if (GTK2_FOUND AND WITH_CONTROL_GUI)
-#    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()
+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()
 
 #if (HAVE_MOCK_CAMERA)
 #    add_executable(test-mock test-mock.c)
-- 
cgit v1.2.3


From ec0e31d89baf7cb6c2fb30ead081655886478609 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 21 Sep 2012 11:59:06 +0200
Subject: Port the unit tests to the plugin manager

---
 test/CMakeLists.txt | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 651c805..ee5b407 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -47,10 +47,6 @@ target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #add_executable(grab_pylon grab_pylon.c)
 #target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #
-#if (NOT DEFINED WITH_CONTROL_GUI)
-#    set(WITH_CONTROL_GUI TRUE)
-#endif()
-#
 if (GTK2_FOUND)
     include_directories(${GTK2_INCLUDE_DIRS})
 
@@ -69,17 +65,17 @@ if (GTK2_FOUND)
         DESTINATION share/libuca)
 endif()
 
-#if (HAVE_MOCK_CAMERA)
-#    add_executable(test-mock test-mock.c)
-#
-#    target_link_libraries(test-mock
-#        uca
-#        ${GLIB2_LIBRARIES}
-#        ${GOBJECT2_LIBRARIES})
-#
-#    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
-#        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
-#endif()
+if (HAVE_MOCK_CAMERA)
+    add_executable(test-mock test-mock.c)
+
+    target_link_libraries(test-mock
+        uca
+        ${GLIB2_LIBRARIES}
+        ${GOBJECT2_LIBRARIES})
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/gtester.xsl
+        ${CMAKE_CURRENT_BINARY_DIR}/gtester.xsl)
+endif()
 
 #add_executable(test-all test-all.c)
 #target_link_libraries(test-all uca
-- 
cgit v1.2.3


From 9f262857d13a3e0d7ee214b33b90359c51227718 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@gmail.com>
Date: Fri, 21 Sep 2012 12:11:55 +0200
Subject: Port grab-async to new plugin manager

---
 test/CMakeLists.txt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'test/CMakeLists.txt')

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ee5b407..e4e60dc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,10 +10,7 @@ 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)
 
-#include_directories(${CMAKE_SOURCE_DIR}/src)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade ${CMAKE_CURRENT_BINARY_DIR})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py ${CMAKE_CURRENT_BINARY_DIR})
 
 # --- Build targets -----------------------------------------------------------
 include_directories(
@@ -37,16 +34,13 @@ if (HAVE_PYLON_CAMERA)
 endif()
 
 add_executable(grab grab.c)
-#add_executable(grab-async grab-async.c)
+add_executable(grab-async grab-async.c)
 add_executable(benchmark benchmark.c)
 
 target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-#target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
-#add_executable(grab_pylon grab_pylon.c)
-#target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
-#
 if (GTK2_FOUND)
     include_directories(${GTK2_INCLUDE_DIRS})
 
-- 
cgit v1.2.3