From 88604a0110bd147b2a6c0a92821317820d992df7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 18 Jan 2016 10:57:45 -0800
Subject: [PATCH] make sure ADD_REMOVE_ICON_NAME set for nsis

---
 cmake/macros/GenerateInstallers.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index fcd7b4f19b..5ae1226ffc 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -27,8 +27,9 @@ macro(GENERATE_INSTALLERS)
   if (WIN32)
     set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
 
-    # reference the installer icon for Add/Remove icon
-    set(ADD_REMOVE_ICON_BAD_PATH "${CPACK_NSIS_MUI_ICON}")
+    # install and reference the Add/Remove icon
+    set(ADD_REMOVE_ICON_NAME "installer.ico")
+    set(ADD_REMOVE_ICON_BAD_PATH "${HF_CMAKE_DIR}/installer/${ADD_REMOVE_ICON_NAME}")
     fix_path_for_nsis(${ADD_REMOVE_ICON_BAD_PATH} ADD_REMOVE_ICON_PATH)
     set(CPACK_NSIS_INSTALLED_ICON_NAME ${ADD_REMOVE_ICON_NAME})