From 52dca96723965e6a8f954c29ef156a6cf5da23b1 Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Sat, 28 Jan 2017 22:39:50 +0100
Subject: [PATCH] Bigfix of InnoSetup parameters (#3628)

---
 CMakeLists.txt                              | 4 +++-
 UpdateInfo.cmake                            | 6 +++---
 tools/win/InnoSetup/WindowsInnoSetup.iss.in | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71c628635..c412f591f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,7 +367,9 @@ if (WIN32)
   list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Windows
                                       -DCXX_FLAGS:STRING="${CXX_FLAGS}"
                                       -DLFLAGS:STRING="${LFLAGS}"
-                                      -DCOMPILER_INFO:STRING="${COMPILER_INFO}")
+                                      -DCOMPILER_INFO:STRING="${COMPILER_INFO}"
+                                      -DCMAKE_INSTALL_PREFIX:STRING="${CMAKE_INSTALL_PREFIX}"
+                                      -DBIT_DEPTH:STRING="${CMAKE_SIZEOF_VOID_P}")
 elseif (APPLE)
   list(APPEND ABOUT_COMMAND_WITH_ARGS -DSYSTEM:STRING=Apple
                                       -DCXX_FLAGS:STRING=${CXX_FLAGS}
diff --git a/UpdateInfo.cmake b/UpdateInfo.cmake
index 1192294d1..ff0f12482 100644
--- a/UpdateInfo.cmake
+++ b/UpdateInfo.cmake
@@ -85,7 +85,7 @@ else (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
 endif (REL_INFO_FILE STREQUAL REL_INFO_FILE-NOTFOUND)
 
 if (WIN32)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    if (BIT_DEPTH EQUAL 4)
         set(BUILD_BIT_DEPTH 32)
         # 32 bits builds has to be installable on 64 bits system, to support WinXP/64.
         set(ARCHITECTURE_ALLOWED "x86 x64 ia64")
@@ -93,7 +93,7 @@ if (WIN32)
         set(INSTALL_MODE "")
         # set part of the output archive name
         set(SYSTEM_NAME "WinXP")
-    elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    elseif (BIT_DEPTH EQUAL 8)
         set(BUILD_BIT_DEPTH 64)
         # Restricting the 64 bits builds to 64 bits systems only
         set(ARCHITECTURE_ALLOWED "x64 ia64")
@@ -101,7 +101,7 @@ if (WIN32)
         set(INSTALL_MODE "x64 ia64")
         # set part of the output archive name
         set(SYSTEM_NAME "WinVista")
-    endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    endif (BIT_DEPTH EQUAL 4)
 
     configure_file ("${PROJECT_SOURCE_DIR}/tools/win/InnoSetup/WindowsInnoSetup.iss.in" "${CMAKE_BINARY_DIR}/rtdata/WindowsInnoSetup.iss")
 endif (WIN32)
diff --git a/tools/win/InnoSetup/WindowsInnoSetup.iss.in b/tools/win/InnoSetup/WindowsInnoSetup.iss.in
index 05fdffefe..82aa7a60d 100644
--- a/tools/win/InnoSetup/WindowsInnoSetup.iss.in
+++ b/tools/win/InnoSetup/WindowsInnoSetup.iss.in
@@ -74,7 +74,6 @@ Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"
 Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"
 Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"
 Name: "japanese"; MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "nepali"; MessagesFile: "compiler:Languages\Nepali.islu"
 Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"
 Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"
 Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"