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...

---
 plugins/dexela/CMakeLists.txt      | 24 ++++++++++++++++++++++++
 plugins/dexela/uca-dexela-camera.c |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 plugins/dexela/CMakeLists.txt

(limited to 'plugins')

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