diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-21 15:46:53 +0100 |
| commit | e18891b3d8980445d54528bd6653403385c0671c (patch) | |
| tree | 3fb2481442ae344d8b33e81dd011627f464552a4 /plugins | |
| parent | 3b524734a29824986ce0344e06cb81527cd266d8 (diff) | |
| parent | 9bdf1616c6f1360658c7a97c0d7e681a932b4ee7 (diff) | |
| download | uca-e18891b3d8980445d54528bd6653403385c0671c.tar.gz uca-e18891b3d8980445d54528bd6653403385c0671c.tar.bz2 uca-e18891b3d8980445d54528bd6653403385c0671c.tar.xz uca-e18891b3d8980445d54528bd6653403385c0671c.zip | |
Merge branch 'dexela'
Conflicts:
plugins/dexela/CMakeLists.txt
src/CMakeLists.txt
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | plugins/dexela/changelog.txt | 2 | ||||
| -rwxr-xr-x | plugins/dexela/libucadexela.so | bin | 0 -> 18705 bytes | |||
| -rwxr-xr-x | plugins/mock/libucamock.so | bin | 0 -> 18045 bytes |
4 files changed, 9 insertions, 6 deletions
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index f6a6ee6..e853b53 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -1,26 +1,27 @@ cmake_minimum_required(VERSION 2.8) project(ucadexela C) +set(VERSION "1.0.0") find_package(DEXELA) if (DEXELA_FOUND) set(UCA_CAMERA_NAME "dexela") - set(PLUGIN_REVISION "2") + set(PLUGIN_REVISION "4") set(PLUGIN_VERSION "1.0.0") + set(PLUGIN_SUMMARY "Dexela plugin for libuca") set(PLUGIN_CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/changelog.txt") + set(PLUGIN_DESCRIPTION "Plugin for the Dexela 1207 detector.") set(PLUGIN_REQUIRES "libuca = 1.1.0, libdexela >= 0.9.2") + set(PLUGIN_VENDOR "ANKA Computing Group") 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) + add_library(ucadexela SHARED uca-dexela-camera.c) - target_link_libraries(ucadexela - ${UCA_DEPS} - ${DEXELA_LIBRARIES}) + target_link_libraries(ucadexela ${UCA_DEPS} ${DEXELA_LIBRARIES}) install(TARGETS ucadexela LIBRARY DESTINATION ${LIB_INSTALL_DIR}/uca diff --git a/plugins/dexela/changelog.txt b/plugins/dexela/changelog.txt index 8b84fa5..2998374 100644 --- a/plugins/dexela/changelog.txt +++ b/plugins/dexela/changelog.txt @@ -1,2 +1,4 @@ +* Thu Mar 14 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-3 +- improve package metadata and build scripts * Thu Mar 7 2013 Mihael Koep <mihael.koep@softwareschneiderei.de> 1.0.0-2 - add changelog and improve package metadata diff --git a/plugins/dexela/libucadexela.so b/plugins/dexela/libucadexela.so Binary files differnew file mode 100755 index 0000000..11070f5 --- /dev/null +++ b/plugins/dexela/libucadexela.so diff --git a/plugins/mock/libucamock.so b/plugins/mock/libucamock.so Binary files differnew file mode 100755 index 0000000..5fd342e --- /dev/null +++ b/plugins/mock/libucamock.so |