merge with master

This commit is contained in:
jfmcarreira committed 2014-06-15 12:49:12 +01:00
1 parent 0f14073f84
commit 47f940c312
1 file changed
+15 -1
+15 -1
View File
@@ -59,19 +59,33 @@ SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (lu
SET(CPACK_PACKAGE_VERSION_MAJOR ${PLAYUVER_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${PLAYUVER_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${PLAYUVER_VERSION_PATH})
SET(CPACK_PACKAGE_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATH}")
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "")
IF( USE_QT4 )
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqtcore4 (>= 4:4.8.5~), libqtgui4 (>= 4:4.8.5~)" )
SET( APPEND_VERSION "${APPEND_VERSION}_wQT4" )
ELSE()
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5core5a, libqt5gui5, libqt5widgets5")
SET( APPEND_VERSION "${APPEND_VERSION}_wQT5" )
ENDIF()
IF( USE_FFMPEG )
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",")
LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libavformat53 (>= 6:0.8.10~), libcodec53 (>= 6:0.8.3-1~), libavutil51 (>= 6:0.8.3-1~)")
SET( APPEND_VERSION "${APPEND_VERSION}_wFFmpeg" )
ENDIF()
IF( USE_OPENCV )
SET( APPEND_VERSION "${APPEND_VERSION}_wOpenCV" )
ENDIF()
IF(UNIX)
EXECUTE_PROCESS(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE DAY)
string(STRIP ${DAY} DAY)
ENDIF(UNIX)
SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-${DAY}" )
INCLUDE(CPack)