From f1900c9e285cd8b0857c51895e2a77605c3484e5 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Mon, 17 Nov 2014 01:03:34 +0000 Subject: [PATCH 1/2] Fix version number with path=0 --- cmake/PlaYUVerVersion.cmake | 53 ++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/cmake/PlaYUVerVersion.cmake b/cmake/PlaYUVerVersion.cmake index ebc9278..188956f 100644 --- a/cmake/PlaYUVerVersion.cmake +++ b/cmake/PlaYUVerVersion.cmake @@ -5,38 +5,43 @@ git_describe(__version --tags) string(REPLACE "-" ";" __version_list ${__version}) list(GET __version_list 0 __version) -list(GET __version_list 1 __patch) +list(LENGTH ${__version_list} __version_list_size ) +IF( ${__version_list_size} GREATER 1 ) + list(GET __version_list 1 PLAYUVER_VERSION_PATCH) +ELSE() + SET( PLAYUVER_VERSION_PATCH 0 ) +ENDIF() + string(REPLACE "." ";" __version_list ${__version}) -list(GET __version_list 0 __major) -list(GET __version_list 1 __minor) +list(GET __version_list 0 PLAYUVER_VERSION_MAJOR) +list(GET __version_list 1 PLAYUVER_VERSION_MINOR) -SET( PLAYUVER_VERSION_MAJOR ${__major}) -SET( PLAYUVER_VERSION_MINOR ${__minor}) -SET( PLAYUVER_VERSION_PATCH ${__patch}) SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}") - -IF( NOT WIN32 ) - - execute_process( - COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - SET( __version_name_deb ${GIT_BRANCH} ) - STRING(REPLACE "master" "latest" __version_name_deb ${__version_name_deb} ) - STRING(REPLACE "devel" "experimental" __version_name_deb ${__version_name_deb} ) - - SET( PACK_NAME ${__version_name_deb} ) +IF( ${PLAYUVER_VERSION_PATCH} EQUAL 0 ) + SET( PACK_NAME "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}" ) ELSE() - SET( PACK_NAME "latest" ) + IF( NOT WIN32 ) + execute_process( + COMMAND git rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE GIT_BRANCH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + SET( __version_name_deb ${GIT_BRANCH} ) + STRING(REPLACE "master" "latest" __version_name_deb ${__version_name_deb} ) + STRING(REPLACE "devel" "experimental" __version_name_deb ${__version_name_deb} ) + + SET( PACK_NAME ${__version_name_deb} ) + ELSE() + SET( PACK_NAME "latest" ) + ENDIF() ENDIF() + unset(__version_name_deb) unset(__version_list) +unset(__version_list_size) unset(__version) -unset(__patch) -unset(__major) -unset(__minor) + From 5efbdb302177a7584e638fc00578b75b87576254 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Mon, 17 Nov 2014 01:21:45 +0000 Subject: [PATCH 2/2] fix versioning --- cmake/PlaYUVerVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/PlaYUVerVersion.cmake b/cmake/PlaYUVerVersion.cmake index 188956f..c7db467 100644 --- a/cmake/PlaYUVerVersion.cmake +++ b/cmake/PlaYUVerVersion.cmake @@ -5,7 +5,7 @@ git_describe(__version --tags) string(REPLACE "-" ";" __version_list ${__version}) list(GET __version_list 0 __version) -list(LENGTH ${__version_list} __version_list_size ) +list(LENGTH __version_list __version_list_size ) IF( ${__version_list_size} GREATER 1 ) list(GET __version_list 1 PLAYUVER_VERSION_PATCH) ELSE()