summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/dexela/.swp.CMakeLists.txtbin129 -> 0 bytes
-rw-r--r--plugins/dexela/CMakeLists.txt18
-rw-r--r--plugins/dexela/changelog.txt2
-rw-r--r--plugins/package-plugin.sh.in2
4 files changed, 9 insertions, 13 deletions
diff --git a/plugins/dexela/.swp.CMakeLists.txt b/plugins/dexela/.swp.CMakeLists.txt
deleted file mode 100644
index 610f745..0000000
--- a/plugins/dexela/.swp.CMakeLists.txt
+++ /dev/null
Binary files differ
diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt
index 60350cf..d98644c 100644
--- a/plugins/dexela/CMakeLists.txt
+++ b/plugins/dexela/CMakeLists.txt
@@ -6,19 +6,16 @@ find_package(DEXELA)
if (DEXELA_FOUND)
set(UCA_CAMERA_NAME "dexela")
- set(PLUGIN_REVISION "2")
+ set(PLUGIN_REVISION "3")
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_SPECIFIC_FLAGS
- "-D CPACK_PACKAGE_NAME=\"uca-plugin-dexela\" -D CPACK_PACKAGE_VERSION=\"${PLUGIN_VERSION}\" -D CPACK_RPM_PACKAGE_RELEASE=\"${PLUGIN_REVISION}\" -D CPACK_RPM_CHANGELOG_FILE=${PLUGIN_CHANGELOG} -D CPACK_RPM_PACKAGE_REQUIRES=${PLUGIN_REQUIRES}")
- set(CPACK_PACKAGE_VERSION ${VERSION})
set(CPACK_GENERATOR "RPM")
set(CPACK_PACKAGE_NAME "uca-plugin-dexela")
- set(CPACK_PACKAGE_RELEASE 1)
- set(CPACK_PACKAGE_CONTACT "Mihael Koep")
- set(CPACK_PACKAGE_VENDOR "ANKA Computing Group")
+ set(PLUGIN_VENDOR "ANKA Computing Group")
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in
@@ -26,12 +23,9 @@ if (DEXELA_FOUND)
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/package-plugin.sh.in b/plugins/package-plugin.sh.in
index bfd1eb3..796517e 100644
--- a/plugins/package-plugin.sh.in
+++ b/plugins/package-plugin.sh.in
@@ -1 +1 @@
-cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" -D CPACK_PACKAGE_FILE_NAME="uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}-${PLUGIN_VERSION}-${PLUGIN_REVISION}" ${PLUGIN_SPECIFIC_FLAGS}
+cpack -D CPACK_INSTALL_CMAKE_PROJECTS="${CMAKE_CURRENT_BINARY_DIR}/;Project;${UCA_CAMERA_NAME};/" -D CPACK_PACKAGE_FILE_NAME="uca-plugin-${UCA_CAMERA_NAME}-${UCA_VERSION_STRING}-${PLUGIN_VERSION}-${PLUGIN_REVISION}" -D CPACK_PACKAGE_NAME="uca-plugin-${UCA_CAMERA_NAME}" -D CPACK_RPM_PACKAGE_SUMMARY="${PLUGIN_SUMMARY}" -D CPACK_PACKAGE_VERSION="${PLUGIN_VERSION}" -D CPACK_RPM_PACKAGE_RELEASE="${PLUGIN_REVISION}" -D CPACK_RPM_CHANGELOG_FILE=${PLUGIN_CHANGELOG} -D CPACK_RPM_PACKAGE_REQUIRES="${PLUGIN_REQUIRES}" -D CPACK_RPM_PACKAGE_DESCRIPTION="${PLUGIN_DESCRIPTION}" -D CPACK_RPM_PACKAGE_VENDOR="${PLUGIN_VENDOR}"