diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-30 18:21:05 +0100 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-30 18:21:05 +0100 |
| commit | 7bd33f1eb88ce537e21693a805390d6385e43b80 (patch) | |
| tree | c87bbe607202050370a31943f1280a2864bae4eb | |
| parent | 4245ad0b8d12574a3c2c15bd057246065e5026ca (diff) | |
| download | libuca-7bd33f1eb88ce537e21693a805390d6385e43b80.tar.gz libuca-7bd33f1eb88ce537e21693a805390d6385e43b80.tar.bz2 libuca-7bd33f1eb88ce537e21693a805390d6385e43b80.tar.xz libuca-7bd33f1eb88ce537e21693a805390d6385e43b80.zip | |
Include CPack in the build process and set the package file name correctly.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libuca.spec.in | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e9d49fa..6856df1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ set(CPACK_DEBIAN_PACKAGE_NAME "libuca") 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_DEBIAN_PACKAGE_ARCHITECTURE "amd64") @@ -72,3 +73,6 @@ add_subdirectory(src) add_subdirectory(plugins) add_subdirectory(test) add_subdirectory(tools) + +include(CPack) + diff --git a/libuca.spec.in b/libuca.spec.in index 3835d89..0f77f95 100644 --- a/libuca.spec.in +++ b/libuca.spec.in @@ -60,11 +60,10 @@ mv "@UCA_BUILD_DIR@/_CPack_Packages/Linux/RPM/tmpBBroot" $RPM_BUILD_ROOT %files %defattr(-,root,root,-) +@CMAKE_INSTALL_PREFIX@/bin/control @CMAKE_INSTALL_PREFIX@/include/uca/*.h -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@ -@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/libuca.so.@UCA_VERSION_MAJOR@.@UCA_VERSION_MINOR@ -@CMAKE_INSTALL_PREFIX@/lib/pkgconfig/uca.pc +@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@/* +@CMAKE_INSTALL_PREFIX@/share/* %changelog |