From 93745b19efcd6cfb1a8be92a7fea420f2b2bd065 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 17 Feb 2016 14:28:06 +0100 Subject: [PATCH] Deployment scripts branding update --- CMakeModules/NSIS.template.in | 7 +++---- TomahawkCPack.cmake | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeModules/NSIS.template.in b/CMakeModules/NSIS.template.in index 36d8d9a06..75c78e863 100644 --- a/CMakeModules/NSIS.template.in +++ b/CMakeModules/NSIS.template.in @@ -18,11 +18,10 @@ !ifndef MINGW_ROOT !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw" !endif - -!define APPLICATION_NAME "Tomahawk" -!define TARGET_NAME "tomahawk" +!define APPLICATION_NAME "@CPACK_PACKAGE_NAME@" +!define TARGET_NAME "@CPACK_PACKAGE_TARGET_NAME@" ;define app id needed for Windows 8 notifications -!define AppUserModelId @TOMAHAWK_APPLICATION_PACKAGE_NAME@ +!define AppUserModelId "@TOMAHAWK_APPLICATION_PACKAGE_NAME@" !define MINGW_BIN "${MINGW_ROOT}/bin" !define MINGW_LIB "${MINGW_ROOT}/lib" diff --git a/TomahawkCPack.cmake b/TomahawkCPack.cmake index 50fe6643c..2178d136b 100644 --- a/TomahawkCPack.cmake +++ b/TomahawkCPack.cmake @@ -13,7 +13,9 @@ SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY ${TOMAHAWK_DESCRIPTION_SUMMARY} ) # Des SET( CPACK_PACKAGE_INSTALL_DIRECTORY ${TOMAHAWK_APPLICATION_NAME} ) # Installation directory on the target system -> C:\Program Files\fellody SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} ) # Registry key used when installing this project CMake 2.5.0 SET( CPACK_PACKAGE_NAME ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name +SET( CPACK_PACKAGE_TARGET_NAME ${TOMAHAWK_TARGET_NAME} ) # Used to build library and executable names SET( CPACK_PACKAGE_VENDOR ${TOMAHAWK_ORGANIZATION_NAME} ) # Package vendor name +SET( TOMAHAWK_APPLICATION_PACKAGE_NAME ${TOMAHAWK_APPLICATION_PACKAGE_NAME} ) SET( CPACK_PACKAGE_VERSION_MAJOR ${TOMAHAWK_VERSION_MAJOR} ) SET( CPACK_PACKAGE_VERSION_MINOR ${TOMAHAWK_VERSION_MINOR} ) SET( CPACK_PACKAGE_VERSION_PATCH ${TOMAHAWK_VERSION_PATCH} )