From 53eb66418a578b8ef3c662ed595f665c2af574ab Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 Jan 2016 15:33:12 -0800
Subject: [PATCH] fix for falsity of build types

---
 cmake/macros/SetPackagingParameters.cmake | 10 +++++++---
 cmake/templates/NSIS.template.in          |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index ebe9da00d4..88257495f6 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -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")
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 295a929ad3..add9e1afa4 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -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' ''