From 4afcd5441e5a8c19ee0dd828f606a6c44b23baeb Mon Sep 17 00:00:00 2001 From: Travis Abbott Date: Fri, 5 Dec 2014 12:53:01 -0600 Subject: [PATCH] fix package versioning in cmake files --- CMakeLists.txt | 2 -- PackageInfo.cmake | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1164815..6d0dc2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,6 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) add_projects(src/lib) add_projects(src/exe) -include(PackageInfo.cmake) - ########################################################################### ## Testing set(TEST_DATA_DIRECTORY ${CMAKE_SOURCE_DIR}/test-data) diff --git a/PackageInfo.cmake b/PackageInfo.cmake index f678c98..91e3fe3 100644 --- a/PackageInfo.cmake +++ b/PackageInfo.cmake @@ -12,7 +12,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Bam readcount Is awesome.") set(CPACK_PACKAGE_NAME "bam-readcount${EXE_VERSION_SUFFIX}") set(CPACK_PACKAGE_VENDOR "wugc") -set(CPACK_PACKAGE_VERSION ${FULL_VERSION}) +set(CPACK_PACKAGE_VERSION ${FULL_VERSION}${PACKAGE_VERSION_SUFFIX}) set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Dave Larson ") set(CPACK_SYSTEM_NAME "Linux-${ARCH}") set(CPACK_TOPLEVEL_TAG "Linux-${ARCH}")