summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 16:03:08 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-28 16:03:08 +0100
commitd3221c2e96b4a19fce6dff7af16d859ae05a690b (patch)
treeed614ad746f1d66399a3c4243a7a57266308ee95 /src
parentb715cc76cfd8d972663bd2dd15c461f0e6ed5fc3 (diff)
downloaduca-d3221c2e96b4a19fce6dff7af16d859ae05a690b.tar.gz
uca-d3221c2e96b4a19fce6dff7af16d859ae05a690b.tar.bz2
uca-d3221c2e96b4a19fce6dff7af16d859ae05a690b.tar.xz
uca-d3221c2e96b4a19fce6dff7af16d859ae05a690b.zip
Add rpm and deb generation
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt30
-rw-r--r--src/uca-grabber.h6
2 files changed, 33 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e863137..de0cc34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,11 +4,13 @@ cmake_minimum_required(VERSION 2.8)
set(uca_SRCS
uca.c
uca-cam.c
+ uca-grabber.c
)
set(uca_HDRS
uca.h
uca-cam.h
+ uca-grabber.h
)
set(uca_LIBS "")
@@ -74,3 +76,31 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(uca SHARED ${uca_SRCS})
target_link_libraries(uca ${uca_LIBS})
+
+# --- Install target ----------------------------------------------------------
+install(TARGETS uca
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib)
+
+install(FILES ${uca_HDRS}
+ DESTINATION include/libuca)
+
+set(CPACK_PACKAGE_DESCRIPTION "Unified Camera Access library")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Abstract interface for different camera classes and frame grabber devices")
+set(CPACK_PACKAGE_NAME "libuca")
+
+# --- Distro specific
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.6), libgcc1 (>= 1:4.1)")
+set(CPACK_SET_DESTDIR ON)
+
+set(CPACK_PACKAGE_CONTACT "Matthias Vogelgesang")
+set(CPACK_PACKAGE_VENDOR "Karlsruhe Institute of Technology/IPE")
+set(CPACK_PACKAGE_VERSION_MAJOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "1")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+set(CPACK_GENERATOR "DEB;RPM;")
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CMAKE_SYSTEM_PROCESSOR}")
+
+include(CPack)
diff --git a/src/uca-grabber.h b/src/uca-grabber.h
index ac2b955..0704610 100644
--- a/src/uca-grabber.h
+++ b/src/uca-grabber.h
@@ -19,15 +19,15 @@ typedef uint32_t (*uca_grabber_destroy) (struct uca_grabber_t *grabber);
/**
* \brief Set a property
* \param[in] property_name Name of the property as defined in XXX
- * \return UCA_ERR_PROP_INVALID if property is not supported on the camera or
- * UCA_ERR_PROP_VALUE_OUT_OF_RANGE if value cannot be set.
+ * \return UCA_ERR_PROP_INVALID if property is not supported on the frame
+ * grabber or UCA_ERR_PROP_VALUE_OUT_OF_RANGE if value cannot be set.
*/
typedef uint32_t (*uca_grabber_set_property) (struct uca_grabber_t *grabber, enum uca_property_ids property, void *data);
/**
* \brief Set a property
* \param[in] property_name Name of the property as defined in XXX
- * \return UCA_ERR_PROP_INVALID if property is not supported on the camera
+ * \return UCA_ERR_PROP_INVALID if property is not supported on the frame grabber
*/
typedef uint32_t (*uca_grabber_get_property) (struct uca_grabber_t *grabber, enum uca_property_ids property, void *data);