Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 15:33:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use BUILD_ORGANIZATION for installer display name

Browse source
This commit is contained in:
Stephen Birarda 2016-01-14 12:11:04 -08:00
parent 7d2684f01e
commit aa9319001e
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmake/macros/GenerateInstallers.cmake
View file

@ -14,7 +14,7 @@ macro(GENERATE_INSTALLERS)
set(CPACK_MODULE_PATH ${CPACK_MODULE_PATH} "${HF_CMAKE_DIR}/templates")
set(_DISPLAY_NAME "High Fidelity")
set(_DISPLAY_NAME ${BUILD_ORGANIZATION})
set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
set(CPACK_PACKAGE_VENDOR "High Fidelity")
@ -22,7 +22,6 @@ macro(GENERATE_INSTALLERS)
set(CPACK_PACKAGE_FILE_NAME "HighFidelity-Alpha-${BUILD_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})
set(CPACK_RESOURCE_FILE_LICENSE "${HF_CMAKE_DIR}/installer/InstallerLicense.txt")

4
cmake/macros/SetPackagingParameters.cmake
View file

@ -22,8 +22,8 @@ macro(SET_PACKAGING_PARAMETERS)
if (RELEASE_TYPE STREQUAL "PRODUCTION")
set(DEPLOY_PACKAGE TRUE)
set(PRODUCTION_BUILD 1)
set(BUILD_ORGANIZATION "High Fidelity")
set(BUILD_VERSION ${RELEASE_NUMBER})
set(BUILD_ORGANIZATION "High Fidelity")
set(HIGH_FIDELITY_PROTOCOL "hifi")
set(INTERFACE_BUNDLE_NAME "High Fidelity")
set(INTERFACE_ICON_PREFIX "interface")
@ -38,8 +38,8 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_ICON "console-beta.ico")
else ()
set(DEV_BUILD 1)
set(BUILD_ORGANIZATION "High Fidelity - Dev")
set(BUILD_VERSION "dev")
set(BUILD_ORGANIZATION "High Fidelity - Dev")
set(INTERFACE_BUNDLE_NAME "Interface")
set(INTERFACE_ICON_PREFIX "interface-beta")
set(CONSOLE_ICON "console-beta.ico")