[arrayfire] 01/79: Fixing CPack.txt
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Jun 15 13:38:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository arrayfire.
commit d8d4b3856056cce8e324a7705fbf4bc18a14d009
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date: Tue Jun 2 14:01:48 2015 -0400
Fixing CPack.txt
---
CPack.txt | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/CPack.txt b/CPack.txt
index ba3b09a..345a5af 100644
--- a/CPack.txt
+++ b/CPack.txt
@@ -1,5 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Version.cmake")
+
# CPack package generation
SET(CPACK_GENERATOR "TGZ;STGZ")
# Create the following installers are as follows:
@@ -13,16 +15,16 @@ ENDIF()
# Common settings to all packaging tools
SET(CPACK_PREFIX_DIR ${CMAKE_INSTALL_PREFIX})
SET(CPACK_PACKAGE_NAME "arrayfire")
-SET(CPACK_PACKAGE_VERSION 3.0.beta)
-SET(CPACK_PACKAGE_VERSION_MAJOR "3")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "beta")
+SET(CPACK_PACKAGE_VERSION ${AF_VERSION})
+SET(CPACK_PACKAGE_VERSION_MAJOR "${AF_VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${AF_VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${AF_VERSION_PATCH}")
IF(BUILD_GRAPHICS)
SET(CPACK_PACKAGE_FILE_NAME
- ${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
+ ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
ELSE()
SET(CPACK_PACKAGE_FILE_NAME
- ${CPACK_PACKAGE_NAME}_no-gl_${CPACK_PACKAGE_VERSION}_${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR})
+ ${CPACK_PACKAGE_NAME}-no-gl-${CPACK_PACKAGE_VERSION})
ENDIF()
SET(CPACK_PACKAGE_VENDOR "ArrayFire")
SET(CPACK_PACKAGE_CONTACT "ArrayFire Development Group <technical at arrayfire.com>")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list