diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | plugins/dexela/.swp.CMakeLists.txt | bin | 0 -> 129 bytes | |||
| -rw-r--r-- | plugins/dexela/CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | plugins/dexela/libucadexela.so | bin | 0 -> 18705 bytes | |||
| -rwxr-xr-x | plugins/mock/libucamock.so | bin | 0 -> 18045 bytes |
5 files changed, 15 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 299cec2..443f33c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,19 +10,20 @@ set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") set(UCA_ABI_VERSION "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}") -set(PACKAGE_VERSION "${UCA_VERSION_STRING}") -set(PACKAGE_NAME "${TARNAME}") +set(CPACK_PACKAGE_VERSION "${UCA_VERSION_STRING}") +set(CPACK_PACKAGE_NAME "${TARNAME}") set(PACKAGE_TARNAME "${TARNAME}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "http://ufo.kit.edu/ufo/newticket") -set(CPACK_GENERATOR "RPM") +set(CPACK_GENERATOR "DEB;RPM") set(CPACK_PACKAGE_RELEASE 3) -set(CPACK_DEBIAN_PACKAGE_NAME "libuca") +set(CPACK_RPM_PACKAGE_RELEASE 3) +set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Matthias Vogelgesang <matthias.vogelgesang@kit.edu>") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${UCA_DESCRIPTION}) set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY ${UCA_DESCRIPTION}) -set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") diff --git a/plugins/dexela/.swp.CMakeLists.txt b/plugins/dexela/.swp.CMakeLists.txt Binary files differnew file mode 100644 index 0000000..610f745 --- /dev/null +++ b/plugins/dexela/.swp.CMakeLists.txt diff --git a/plugins/dexela/CMakeLists.txt b/plugins/dexela/CMakeLists.txt index 81a0de0..60350cf 100644 --- a/plugins/dexela/CMakeLists.txt +++ b/plugins/dexela/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required(VERSION 2.8) project(ucadexela C) +set(VERSION "1.0.0") find_package(DEXELA) @@ -12,6 +13,14 @@ if (DEXELA_FOUND) 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(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../package-plugin.sh.in ${CMAKE_CURRENT_BINARY_DIR}/../../package-plugin-${UCA_CAMERA_NAME}.sh) 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 |