diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-30 17:54:36 +0100 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-30 17:54:36 +0100 |
| commit | 8ce877dfe1dcf1fc1896142405c61a76d5b8b00f (patch) | |
| tree | bec6e703ccbb5529fdc6595a8469064bf02315c0 | |
| parent | 620871c0c8e742af5f55ae9a2d6fe2066aa35193 (diff) | |
| download | uca-8ce877dfe1dcf1fc1896142405c61a76d5b8b00f.tar.gz uca-8ce877dfe1dcf1fc1896142405c61a76d5b8b00f.tar.bz2 uca-8ce877dfe1dcf1fc1896142405c61a76d5b8b00f.tar.xz uca-8ce877dfe1dcf1fc1896142405c61a76d5b8b00f.zip | |
Fix incomplete committ...
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | cmake/FindDEXELA.cmake | 2 | ||||
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | plugins/dexela/uca-dexela-camera.c | 4 |
4 files changed, 33 insertions, 3 deletions
@@ -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; } |