From c29d2d0cb98a9019ed6e41f3b84024cffe3264be Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 2 Oct 2014 15:26:34 +0100 Subject: [PATCH] change package names --- CMakeLists.txt | 2 ++ PlaYUVerVersion.cmake | 8 ++++++++ cmake/Install.cmake | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34e15c6..b755155 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,7 @@ ADD_DEFINITIONS( "-DPLAYUVER" ) ###################################################################################### # Variables ###################################################################################### +ADD_OPTION(PLAYUVER_LONGVERSIONNAME "Use long version name in deb" OFF ) ADD_OPTION(PLAYUVER_WERROR "Warnings as errors" OFF ) ADD_OPTION(PLAYUVER_THREADED_MODULES "Warnings as errors" ON ) ADD_OPTION(PLAYUVER_INSTALL_LIBS "Install PlaYUVer Lib" ON ) @@ -138,6 +139,7 @@ status("Configuration:") status(" Build type:" "${CMAKE_BUILD_TYPE}") status(" Build flags:" "${CMAKE_CXX_FLAGS}") status(" Warnings as errors:" USE_WERROR THEN YES ELSE NO) +status(" Package Name:" "${PACKAGE_FILE_NAME}" ) status("Dependencies:") status(" QT:" USE_QT4 THEN "QT4" ELSE "QT5") status(" OpenCV:" USE_OPENCV THEN YES ELSE NO) diff --git a/PlaYUVerVersion.cmake b/PlaYUVerVersion.cmake index 835de27..7da6349 100644 --- a/PlaYUVerVersion.cmake +++ b/PlaYUVerVersion.cmake @@ -16,6 +16,14 @@ SET( PLAYUVER_VERSION_MINOR ${__minor}) SET( PLAYUVER_VERSION_PATCH ${__patch}) SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}") +execute_process( + COMMAND git rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE GIT_BRANCH + OUTPUT_STRIP_TRAILING_WHITESPACE +) + + unset(__version_list) unset(__version) unset(__patch) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 2094255..5f4fd68 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -82,6 +82,16 @@ IF( USE_OPENCV ) SET( APPEND_VERSION "${APPEND_VERSION}_wOpenCV" ) ENDIF() -SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) +IF( PLAYUVER_LONGVERSIONNAME ) + SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) + SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) +ELSE() +# message(STATUS ${GIT_BRANCH} ) + STRING(REPLACE "master" "stable" __version_name_deb ${GIT_BRANCH} ) + STRING(REPLACE "devel" "latest" __version_name_deb ${GIT_BRANCH} ) + message(STATUS ${GIT_BRANCH} ) + SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${__version_name_deb}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) + SET( PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME} ) +ENDIF() INCLUDE(CPack)