From aa9319001ed783c4b07cfecf2465b0adf08de939 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 Jan 2016 12:11:04 -0800
Subject: [PATCH] use BUILD_ORGANIZATION for installer display name

---
 cmake/macros/GenerateInstallers.cmake     | 3 +--
 cmake/macros/SetPackagingParameters.cmake | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 408c4f27f3..e4c84ebef2 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -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")
 
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 0748a91001..5491d6f5d9 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -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")