From 2311627599aa417b7379720a50b31b28c474fcc1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 18 Jan 2016 14:20:33 -0800
Subject: [PATCH] set installer to be DPI aware

---
 cmake/templates/NSIS.template.in | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 1eb0b04f57..0ebdafa86e 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -37,6 +37,7 @@
   ; Set name prior to inner loop so uninstaller has correct values
   Name "@CPACK_NSIS_PACKAGE_NAME@"
   BrandingText " "
+  ManifestDPIAware true
 
   !ifdef INNER
     !echo "Inner invocation"                  ; just to see what's going on
@@ -679,7 +680,6 @@ FunctionEnd
 
   ReserveFile "NSIS.InstallOptions.ini"
   ReserveFile "@POST_INSTALL_OPTIONS_PATH@"
-  ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 
 ;--------------------------------
 ;Installer Sections
@@ -990,11 +990,6 @@ FunctionEnd
 ; determine admin versus local install
 Function un.onInit
 
-  ; manually set this process to DPI aware for fonts on high-dpi screens
-  ${If} ${AtLeastWinVista}
-    System::Call 'user32::SetProcessDPIAware()'
-  ${EndIf}
-
   ; In order for the uninstaller to be able to remove itself, we have to do some trickery here.
   ; If the $EXEPATH does not contain the $TEMP dir, this instance is not the copied one
   ; so we move it to the $TEMP dir and then execute the copied uninstaller.
@@ -1220,11 +1215,6 @@ SectionEnd
 
 Function .onInit
 
-  ; manually set this process to DPI aware for fonts on high-dpi screens
-  ${If} ${AtLeastWinVista}
-    System::Call 'user32::SetProcessDPIAware()'
-  ${EndIf}
-
   !ifdef INNER
     ; If INNER is defined, then we aren't supposed to do anything except write out
     ; the installer.  This is better than processing a command line option as it means