From d155d191982cab3c1a06f84f64db0105f9353a22 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 30 Jan 2018 17:08:10 -0800
Subject: [PATCH 1/2] Fix cmake install cmd

---
 cmake/macros/AddCrashpad.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/macros/AddCrashpad.cmake b/cmake/macros/AddCrashpad.cmake
index bf59418f37..7d161be7f0 100644
--- a/cmake/macros/AddCrashpad.cmake
+++ b/cmake/macros/AddCrashpad.cmake
@@ -51,8 +51,8 @@ macro(add_crashpad)
     )
     install(
       PROGRAMS ${CRASHPAD_HANDLER_EXE_PATH}
-      DESTINATION ${CLIENT_COMPONENT}
-      COMPONENT ${INTERFACE_INSTALL_DIR}
+      DESTINATION ${INTERFACE_INSTALL_DIR}
+      COMPONENT ${CLIENT_COMPONENT}
     )
   endif ()
 endmacro()

From 97729e8f410f1fdbcae09539a7ac0286c24d24af Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 30 Jan 2018 17:10:06 -0800
Subject: [PATCH 2/2] Cleanup bad install

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

diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 8abb202bd4..c1bfebe2c4 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -823,6 +823,7 @@ Section "-Core installation"
   Delete "$INSTDIR\server-console.exe"
   RMDir /r "$INSTDIR\locales"
   RMDir /r "$INSTDIR\resources\app"
+  RMDir /r "$INSTDIR\client"
   Delete "$INSTDIR\resources\atom.asar"
   Delete "$INSTDIR\build-info.json"
   Delete "$INSTDIR\content_resources_200_percent.pak"