jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
jfmcarreira
2014-11-17 02:04:27 +00:00
parent ebde4d4cc7 5efbdb3021
commit 17aeeb14c8
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/PlaYUVerVersion.cmake
+29 -24
View File
@@ -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)