From 52aa84e240e05807d76d9f4c2f1d5a46c2deea73 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 17 Jun 2014 16:45:17 +0100 Subject: [PATCH] add arch to a global win linux var --- cmake/Install.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 5af6b26..c5a1c51 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -57,6 +57,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PLAYUVER_VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${PLAYUVER_VERSION_PATH}) SET(CPACK_PACKAGE_VERSION ${PLAYUVER_VERSION}) +SET(CPACK_PACKAGE_ARCHITECTURE "amd64") IF( UNIX ) @@ -64,7 +65,7 @@ IF( UNIX ) 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_DEBIAN_PACKAGE_ARCHITECTURE "amd64") + SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CPACK_PACKAGE_ARCHITECTURE} ) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "") IF( USE_QT4 ) LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libqtcore4 (>= 4:4.8.5~), libqtgui4 (>= 4:4.8.5~)" ) @@ -102,6 +103,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_DEBIAN_PACKAGE_ARCHITECTURE}" ) +SET( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${APPEND_VERSION}-Linux-${CPACK_PACKAGE_ARCHITECTURE}" ) INCLUDE(CPack)