diff options
| author |   Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-13 16:46:24 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-13 14:47:07 +0000 |
| commit | 8e77617e873ecc0206ffe446bb98b5f72f288a73 (patch) | |
| tree | 5faecf46aed0b6e74aa87ff53a02bffdd4cd0b99 | |
| parent | 69304b8e1417582fb603c15fb9ef5b126606a7c5 (diff) | |
Adding versioning also for libdash
Change-Id: I52b5bc76d6b684538ec228b68c775f054231985f
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
| -rw-r--r-- | libdash/CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index a40589ab..06f4d35c 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.5) project(libdash) -set(${CMAKE_PROJECT_NAME}_VERSION_MAJOR 1) -set(${CMAKE_PROJECT_NAME}_VERSION_MINOR 0) - set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") set(DEBUG_BUILD FALSE) set(HEADER_FILES @@ -185,26 +182,28 @@ SET(VENDOR "Cisco Systems" CACHE STRING "Vendor") SET(CONTACT "msardara@cisco.com" CACHE STRING "Contact") SET(DISTRIBUTION "xenial" CACHE STRING "Distribution") SET(ARCHITECTURE "amd64" CACHE STRING "Architecture") -SET(PACKAGE_MAINTAINER "Mauro Sardara" CACHE STRING "Maintainer") -SET(PACKAGE_VERSION "1.0" CACHE STRING "Version") +SET(PACKAGE_MAINTAINER "Mauro Sardara (msardara@cisco.com)" CACHE STRING "Maintainer") SET(BUILD_NUMBER "1" CACHE STRING "Build Number") STRING(TOLOWER ${CMAKE_PROJECT_NAME} PACKAGE_NAME) SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr") -SET(CPACK_PACKAGE_VERSION_MAJOR ${${CMAKE_PROJECT_NAME}_VERSION_MAJOR}) -SET(CPACK_PACKAGE_VERSION_MINOR ${${CMAKE_PROJECT_NAME}_VERSION_MINOR}) SET(CPACK_PACKAGE_VENDOR ${VENDOR}) SET(CPACK_PACKAGE_CONTACT ${CONTACT}) +# Get the version +execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/version + OUTPUT_VARIABLE PACKAGE_VERSION) +string(STRIP ${PACKAGE_VERSION} PACKAGE_VERSION) + if(DEB_PACKAGE) SET(TYPE "DEBIAN") SET(GENERATOR "DEB") - SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}~${DISTRIBUTION}_${ARCHITECTURE}") + SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}") SET(CPACK_${TYPE}_PACKAGE_REQUIRES "zlib1g, git-core, libxml2, libcurl4-openssl") elseif(RPM_PACKAGE) SET(TYPE "RPM") SET(GENERATOR "RPM") - SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${BUILD_NUMBER}.${DISTRIBUTION}.${ARCHITECTURE}") + SET(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}") SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages") SET(CPACK_${TYPE}_PACKAGE_REQUIRES "libxml2 libcurl zlib") else() |