From b62a26eebde7193eb3a4f7bd76dd5412d473a515 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 18 Jan 2010 18:39:22 +0100
Subject: [PATCH] update version strings for cpack

---
 CASA/CMakeLists.txt | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/CASA/CMakeLists.txt b/CASA/CMakeLists.txt
index 62875825..17766fe4 100644
--- a/CASA/CMakeLists.txt
+++ b/CASA/CMakeLists.txt
@@ -6,17 +6,17 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 enable_language(C CXX CSharp)
 
 SET (VERSION_MAJOR "1")
-SET (VERSION_MINOR "7")
-SET (VERSION_SUB   "0")
+SET (VERSION_MINOR "8")
 SET (VERSION_PATCH "0")
-# SET (VERSION_DEVEL "1")
-# SET (VERSION_SUFFIX "a")
+SET (VERSION_SUB "0")
+SET (VERSION_DEVEL "0")
+SET (VERSION_SUFFIX "-pre1")
 
-SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB})
+SET (VERSION_PATCH "${VERSION_PATCH}${VERSION_SUFFIX}")
 
-IF (VERSION_PATCH)
-    SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}.${VERSION_PATCH})
-ENDIF (VERSION_PATCH)
+IF (VERSION_SUB)
+    SET (VERSION_PATCH "${VERSION_PATCH}.${VERSION_SUB}${VERSION_SUFFIX}")
+ENDIF (VERSION_SUB)
 
 IF (VERSION_DEVEL)
     # for snapshot Version Number
@@ -25,9 +25,11 @@ IF (VERSION_DEVEL)
 	Subversion_WC_INFO(${PROJECT_SOURCE_DIR} CASA)
 	MESSAGE("Current revision is ${CASA_WC_REVISION}")
     ENDIF (Subversion_FOUND)
-    SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}.${CASA_WC_REVISION})
+    SET (VERSION_PATCH "${VERSION_PATCH}.${CASA_WC_REVISION})${VERSION_SUFFIX}")
 ENDIF (VERSION_DEVEL)
 
+SET (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+
 # Set install locations:
 set(LIB_SUFFIX               ""                                            CACHE STRING "Define suffix of directory name (32/64)" )
 set(EXEC_INSTALL_PREFIX      "${CMAKE_INSTALL_PREFIX}"                     CACHE PATH "Base directory for executables and libraries" FORCE)
@@ -46,7 +48,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
 include(CMakeJavaInformation)
 include(CMakeDetermineJavaCompiler)
-include(CPack REQUIRED)
 
 find_package( PAM REQUIRED)
 find_package( Mono REQUIRED)
@@ -84,6 +85,9 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 add_custom_target(uninstall
     "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
 
+add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+
 add_subdirectory(micasadk)
 add_subdirectory(micasad/lib)
 add_subdirectory(sharp)
@@ -94,19 +98,17 @@ add_subdirectory(cli)
 add_subdirectory(gui)
 add_subdirectory(logincapture)
 add_subdirectory(jwrapper)
+add_subdirectory(include)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Common Authentication Service Adapter (CASA).")
 SET(CPACK_PACKAGE_VENDOR "http://code.google.com/p/casa-auth/")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_PACKAGE_VERSION "${VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_SUFFIX}")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CASA-${VERSION}${VERSION_SUFFIX}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "CASA-${VERSION}${VERSION_SUFFIX}")
-SET(CPACK_GENERATOR TGZ)
-SET(CPACK_SOURCE_GENERATOR TBZ2)
+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
+set(CPACK_SOURCE_GENERATOR "TBZ2")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CASA-${VERSION}")
 SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o")
-SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")
-SET(CPACK_STRIP_FILES "")
-SET(CPACK_SYSTEM_NAME "Linux")
-
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+include(CPack)