Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2014-10-03 12:33:44 +01:00
commit c9517e7736
1 file changed
+3 -2
+3 -2
View File
@@ -93,8 +93,9 @@ IF( PLAYUVER_LONGVERSIONNAME )
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} )
SET( __version_name_deb ${GIT_BRANCH} )
STRING(REPLACE "master" "stable" __version_name_deb ${__version_name_deb} )
STRING(REPLACE "devel" "latest" __version_name_deb ${__version_name_deb} )
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} )