Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 10:02:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for falsity of build types

Browse source
This commit is contained in:
Stephen Birarda 2016-01-11 15:33:12 -08:00
parent a2904cdc7b
commit 53eb66418a
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/macros/SetPackagingParameters.cmake
View file

@ -12,10 +12,14 @@
# and decides how targets should be packaged.
macro(SET_PACKAGING_PARAMETERS)
set(PR_BUILD 0)
set(PRODUCTION_BUILD 0)
set(DEV_BUILD 0)
if (DEFINED ENV{JOB_ID})
set(DEPLOY_PACKAGE TRUE)
set(BUILD_SEQ $ENV{JOB_ID})
set(PRODUCTION_BUILD TRUE)
set(PRODUCTION_BUILD 1)
set(INSTALLER_COMPANY "High Fidelity")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
@ -25,7 +29,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_ICON "console.ico")
elseif (DEFINED ENV{ghprbPullId})
set(DEPLOY_PACKAGE TRUE)
set(PR_BUILD TRUE)
set(PR_BUILD 1)
set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
set(INSTALLER_COMPANY "High Fidelity - PR")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
@ -35,7 +39,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(CONSOLE_ICON "console-beta.ico")
else ()
set(BUILD_SEQ "dev")
set(DEV_BUILD TRUE)
set(DEV_BUILD 1)
set(INSTALLER_COMPANY "High Fidelity - Dev")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "dev-interface-win64.exe")

2
cmake/templates/NSIS.template.in
View file

@ -701,7 +701,7 @@ Section "-Core installation"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" \
"$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
${If} @PRODUCTION_BUILD@ == "1"
${If} "@PRODUCTION_BUILD@" == "1"
; hifi:// protocol handler registry entries
WriteRegStr HKCR '@HIGH_FIDELITY_PROTOCOL@' '' 'URL:High Fidelity Protocol'
WriteRegStr HKCR '@HIGH_FIDELITY_PROTOCOL@' 'URL Protocol' ''