From c8c7cbd950f031d6de852fdac924ad28015b61e7 Mon Sep 17 00:00:00 2001
From: beaglejoe <beaglejoe@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Mon, 13 Jul 2020 12:09:48 +0000
Subject: [PATCH] Add install step for missing files for packaging

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7155 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5b99038053fd1a7afe2d49002de484b6f9bfb044
Former-commit-id: a0d89099d1de7c11258463c042348d6cfaa6495c
---
 CMakeLists.txt                          | 7 +++++++
 packaging/windows/speed-dreams-base.nsi | 5 +----
 packaging/windows/speed-dreams.nsh.in   | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c56518b6..b160cfcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,6 +147,13 @@ ADD_SUBDIRECTORY(cmake)
 # Update (and then install) version.xml from their respective version.
 SD_UPDATE_SETTINGS_VERSION()
 
+IF(MSVC)
+   INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/faq/faq.html DESTINATION ./doc)
+   INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/how_to_drive.html DESTINATION ./doc)
+   INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/images/ DESTINATION ./doc/images/)
+ENDIF(MSVC)
+
+
 # Usefull for using an installation of SD as a robot development framework without building it.
 INSTALL_SD_CMAKE()
 
diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi
index 4e2b5403..b5aefefa 100644
--- a/packaging/windows/speed-dreams-base.nsi
+++ b/packaging/windows/speed-dreams-base.nsi
@@ -134,10 +134,7 @@ Section "!Base System" SEC01
 
   ; Documentation
   SetOutPath "$INSTDIR\doc"
-  File "..\..\doc\faq\faq.html"
-
-  SetOutPath "$INSTDIR\doc"
-  File /r /x .svn "..\..\doc\userman\*.*"
+  File /r /x .svn "${BUILD_INST_DIR}\doc\*.*"
 
   ; Base robots binaries
   SetOutPath "$INSTDIR\lib\drivers\human"
diff --git a/packaging/windows/speed-dreams.nsh.in b/packaging/windows/speed-dreams.nsh.in
index cf1e20b0..f315ee3c 100644
--- a/packaging/windows/speed-dreams.nsh.in
+++ b/packaging/windows/speed-dreams.nsh.in
@@ -86,14 +86,14 @@ SetCompressor /SOLID lzma ; 1-block compression, smaller but longer (generation,
 !include "MUI.nsh" ; TODO: Move to MUI2
 
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "..\..\data\data\img\header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header.bmp"
 
-!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\data\data\img\header-vert.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header-vert.bmp"
 
 !define MUI_ABORTWARNING
 
-!define MUI_ICON "..\..\data\data\icons\icon.ico"
-!define MUI_UNICON "..\..\data\data\icons\icon.ico"
+!define MUI_ICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
+!define MUI_UNICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
 
 !define MUI_LICENSEPAGE_CHECKBOX