fix package versioning in cmake files

genome · 4afcd5441e5a8c19ee0dd828f606a6c44b23baeb · Travis Abbott committed Dec 5, 2014 · Dec 5, 2014 · 4afcd54
1 parent 8668677
commit 4afcd5441e5a8c19ee0dd828f606a6c44b23baeb
Unified Split

Showing with 1 addition and 3 deletions.

+0 −2 CMakeLists.txt

+1 −1 PackageInfo.cmake
diff --git 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
@@ -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 <dlarson@genome.wustl.edu>")
 set(CPACK_SYSTEM_NAME "Linux-${ARCH}")
 set(CPACK_TOPLEVEL_TAG "Linux-${ARCH}")