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

improve fevor cmake variables and some fixes in version number

Browse Source
This commit is contained in:
jfmcarreira committed 2014-06-15 18:41:12 +01:00
1 parent b04fac84c2
commit dbf0c6f5c0
2 files changed
+15 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+12 -1
View File
@@ -7,10 +7,19 @@ cmake_minimum_required( VERSION 2.8.9 )
######################################################################################
# Project Definition
######################################################################################
IF(UNIX)
EXECUTE_PROCESS(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE DAY)
string(STRIP ${DAY} DAY)
ENDIF(UNIX)
SET( PROJECT_NAME playuver )
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "0" )
SET( PLAYUVER_VERSION_PATH "9999" )
SET( PLAYUVER_VERSION_PATCH "9999" )
#SET( PLAYUVER_VERSION_PATCH ${DAY} )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
PROJECT( ${PROJECT_NAME} )
INCLUDE( cmake/CMakeMacros.cmake )
@@ -69,6 +78,8 @@ ENDIF()
INCLUDE( cmake/LibPixfc.cmake )
INCLUDE( cmake/LibFFmpeg.cmake )
IF( USE_FERVOR )
SET( FERVOR_APP_NAME ${PROJECT_NAME} )
SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} )
ADD_SUBDIRECTORY( fervor )
INCLUDE_DIRECTORIES( fervor )
LIST(APPEND LINKER_LIBS "Fervor" )
cmake/Install.cmake
+3 -3
View File
@@ -51,7 +51,7 @@ ENDIF()
######################################################################################
SET(CPACK_GENERATOR "DEB")
SET(CPACK_PACKAGE_NAME "playuver")
SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "plaYUVer is an open-source QT based raw video player")
SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)")
SET(CPACK_PACKAGE_CONTACT "Joao Carreira (jfmcarreira@gmail.com), Luis Lucas (luisfrlucas@gmail.com)")
@@ -59,7 +59,7 @@ 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_PACKAGE_VERSION ${PLAYUVER_VERSION})
SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "")
@@ -86,6 +86,6 @@ IF(UNIX)
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}" )
SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}" )
INCLUDE(CPack)