From 4b5340396590f499e3759b1e10e73a334e48a2fd Mon Sep 17 00:00:00 2001
From: Mihael Koep <koep@schneide.com>
Date: Thu, 9 Aug 2012 12:04:21 +0200
Subject: Add ignore file.

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..60578cb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+CMake*
+*~
+*.cmake
+Makefile
+src/libuca.so*
-- 
cgit v1.2.3


From 26a14d07343ce6285a29c0005c50f056c9986d35 Mon Sep 17 00:00:00 2001
From: Mihael Koep <koep@schneide.com>
Date: Tue, 4 Sep 2012 14:41:25 +0200
Subject: Ignore some generated files.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 60578cb..8bea720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@ CMake*
 *.cmake
 Makefile
 src/libuca.so*
+test/
+libuca.spec
+src/config.h
-- 
cgit v1.2.3


From 8ce877dfe1dcf1fc1896142405c61a76d5b8b00f Mon Sep 17 00:00:00 2001
From: Mihael Koep <koep@schneide.com>
Date: Tue, 30 Oct 2012 17:54:36 +0100
Subject: Fix incomplete committ...

---
 .gitignore                         |  6 +++++-
 cmake/FindDEXELA.cmake             |  2 ++
 plugins/dexela/CMakeLists.txt      | 24 ++++++++++++++++++++++++
 plugins/dexela/uca-dexela-camera.c |  4 ++--
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 plugins/dexela/CMakeLists.txt

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 8bea720..e233eae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-CMake*
+CMakeFiles
 *~
 *.cmake
 Makefile
@@ -6,3 +6,7 @@ src/libuca.so*
 test/
 libuca.spec
 src/config.h
+*.rpm
+install_manifest.txt
+_CPack_Packages
+*.orig
diff --git a/cmake/FindDEXELA.cmake b/cmake/FindDEXELA.cmake
index 1fef7af..0412b19 100644
--- a/cmake/FindDEXELA.cmake
+++ b/cmake/FindDEXELA.cmake
@@ -17,3 +17,5 @@ mark_as_advanced(
     DEXELA_INCLUDE_DIRS
     DEXELA_LIBRARIES
 )
+
+message("-- Dexela libraries found: ${DEXELA_FOUND}")
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
new file mode 100644
index 0000000..8522192
--- /dev/null
+++ b/plugins/dexela/CMakeLists.txt
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8)
+project(ucadexela C)
+
+find_package(DEXELA)
+
+if (DEXELA_FOUND)
+    set(UCA_CAMERA_NAME "dexela")
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh)
+
+    include_directories(${DEXELA_INCLUDE_DIRS})
+
+    add_library(ucadexela SHARED
+                uca-dexela-camera.c)
+
+    target_link_libraries(ucadexela
+                          ${UCA_DEPS}
+                          ${DEXELA_LIBRARIES})
+
+    install(TARGETS ucadexela
+            LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca
+            COMPONENT ${UCA_CAMERA_NAME})
+endif()
diff --git a/plugins/dexela/uca-dexela-camera.c b/plugins/dexela/uca-dexela-camera.c
index 7ec96e6..425b742 100644
--- a/plugins/dexela/uca-dexela-camera.c
+++ b/plugins/dexela/uca-dexela-camera.c
@@ -94,7 +94,7 @@ static void fill_binnings(UcaDexelaCameraPrivate *priv)
 static void map_dexela_trigger_mode_to_uca(GValue* value, TriggerMode mode)
 {
     if (mode == SOFTWARE) {
-        g_value_set_enum(value, UCA_CAMERA_TRIGGER_INTERNAL);
+        g_value_set_enum(value, UCA_CAMERA_TRIGGER_SOFTWARE);
         return;
     }
     if (mode == EDGE) {
@@ -111,7 +111,7 @@ static void map_dexela_trigger_mode_to_uca(GValue* value, TriggerMode mode)
 
 static void set_trigger_mode(UcaCameraTrigger mode)
 {
-    if (mode == UCA_CAMERA_TRIGGER_INTERNAL) {
+    if (mode == UCA_CAMERA_TRIGGER_SOFTWARE) {
         dexela_set_trigger_mode(SOFTWARE);
         return;
     }
-- 
cgit v1.2.3


From 7b45ba3f7a80161cb0ec4ea30375b64abffb9079 Mon Sep 17 00:00:00 2001
From: Mihael Koep <koep@schneide.com>
Date: Thu, 21 Feb 2013 11:51:32 +0100
Subject: add some binaries to gitignore.

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index e233eae..5ee492f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,9 @@ src/config.h
 install_manifest.txt
 _CPack_Packages
 *.orig
+tools/benchmark
+tools/gen-doc
+tools/grab
+tools/grab-async
+tools/gui/control
+tools/perf
-- 
cgit v1.2.3