From 5d99f2736d2340f50dadbfcb7e0db822372d3b72 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 26 Sep 2012 12:33:56 +0200 Subject: Bump version to prepare for SO fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 48592fd..e60cfe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(uca C) set(TARNAME "libuca") set(UCA_VERSION_MAJOR "1") set(UCA_VERSION_MINOR "0") -set(UCA_VERSION_PATCH "0") +set(UCA_VERSION_PATCH "1") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") -- cgit v1.2.3 From ee6b7a941f7ef7cdcc92c04b80a683d7370f52bd Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 26 Sep 2012 12:35:55 +0200 Subject: Bump version for next fixes --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e60cfe5..acf0386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(uca C) set(TARNAME "libuca") set(UCA_VERSION_MAJOR "1") set(UCA_VERSION_MINOR "0") -set(UCA_VERSION_PATCH "1") +set(UCA_VERSION_PATCH "2-dev") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") -- cgit v1.2.3 From 37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Fri, 19 Oct 2012 16:40:52 +0200 Subject: Fix version stuff for rpm packaging. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index acf0386..dffd35d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(uca C) set(TARNAME "libuca") set(UCA_VERSION_MAJOR "1") set(UCA_VERSION_MINOR "0") -set(UCA_VERSION_PATCH "2-dev") +set(UCA_VERSION_PATCH "2dev") set(UCA_DESCRIPTION "Unified Camera Access") set(UCA_VERSION_STRING "${UCA_VERSION_MAJOR}.${UCA_VERSION_MINOR}.${UCA_VERSION_PATCH}") -- cgit v1.2.3 From c11a6c7bed07d50fb654984fe603b27613e9abc2 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 30 Oct 2012 18:01:17 +0100 Subject: Add configuring of the spec-file. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bef3712..e9d49fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,8 @@ set(UCA_ENUM_HDRS configure_file(${CMAKE_CURRENT_SOURCE_DIR}/package.sh.in ${CMAKE_CURRENT_BINARY_DIR}/package.sh) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libuca.spec.in" + "${CMAKE_CURRENT_BINARY_DIR}/libuca.spec" @ONLY IMMEDIATE) # --- Common flags ------------------------------------------------------------ -- cgit v1.2.3 From 7bd33f1eb88ce537e21693a805390d6385e43b80 Mon Sep 17 00:00:00 2001 From: Mihael Koep Date: Tue, 30 Oct 2012 18:21:05 +0100 Subject: Include CPack in the build process and set the package file name correctly. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeLists.txt') 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 ") 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) + -- cgit v1.2.3