From dd7e2932d4b502cace8f0087c7efef6c41446720 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 27 Jun 2014 11:25:07 +0100 Subject: [PATCH] fix OS name in the package --- cmake/Install.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 0a53da2..51f5504 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -69,6 +69,7 @@ SET(CPACK_PACKAGE_ARCHITECTURE "amd64") IF( UNIX ) SET(CPACK_GENERATOR "DEB;ZIP") + SET(OS "Linux") 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)") @@ -92,6 +93,7 @@ ENDIF() IF( WIN32 ) SET(CPACK_GENERATOR "ZIP") + SET(OS "Windows") #EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${DAY}) #string(REGEX REPLACE "(..)/(..)/..(..).*" "\\1/\\2/\\3" ${DAY} ${${DAY}}) @@ -110,6 +112,6 @@ IF( USE_OPENCV ) SET( APPEND_VERSION "${APPEND_VERSION}_wOpenCV" ) ENDIF() -SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_PACKAGE_ARCHITECTURE}" ) +SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-${OS}-${CPACK_PACKAGE_ARCHITECTURE}" ) INCLUDE(CPack)