From 88e17868493b7e08fe3339069c11cbc5c39e62e5 Mon Sep 17 00:00:00 2001
From: Nik Reist <zeroability@tutanota.com>
Date: Sat, 7 Nov 2020 22:26:44 -0500
Subject: REFAC(installer-msi) Simplify WiX component install

Remove CPack and previous WiX installer projects and sources
Add toolset and for WixSharp to facilitate client and server builds
individually or collectively.
Add multilanguage build with packaging=ON and translations=ON, and
standard build with packaging=ON. Builds are also aware of client and
server option settings.
Add correct LICENSE to installer
---
 CMakeLists.txt | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b7af9623..a1b33b29e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,9 @@ include(compiler)
 include(os)
 
 if (64_BIT)
-	set(ARCH "64bit")
+	set(ARCH "x64")
 else()
-	set(ARCH "32bit")
+	set(ARCH "x86")
 endif()
 
 message(STATUS "##################################################")
@@ -120,9 +120,29 @@ if(plugins AND client)
 endif()
 
 if(packaging)
+	file(COPY 
+		${CMAKE_SOURCE_DIR}/installer/gpl.txt
+		${CMAKE_SOURCE_DIR}/installer/lgpl.txt
+		${CMAKE_SOURCE_DIR}/installer/Mumble.rtf
+		${CMAKE_SOURCE_DIR}/installer/portaudio.txt
+		${CMAKE_SOURCE_DIR}/installer/qt.txt
+		${CMAKE_SOURCE_DIR}/installer/speex.txt
+		DESTINATION 
+			${CMAKE_BINARY_DIR}/licenses
+	)
 	if(WIN32)
-		file(COPY "${CMAKE_SOURCE_DIR}/scripts/Create-Win32InstallerMUI.ps1" DESTINATION ${CMAKE_BINARY_DIR})
+		file(COPY
+			${CMAKE_SOURCE_DIR}/installer/bannrbmp.bmp
+			${CMAKE_SOURCE_DIR}/installer/dlgbmp.bmp
+			DESTINATION
+				${CMAKE_BINARY_DIR}/installer
+		)
+		
+		file(COPY 
+			${CMAKE_SOURCE_DIR}/icons/mumble.ico
+			${CMAKE_SOURCE_DIR}/icons/murmur.ico
+			DESTINATION 
+				${CMAKE_BINARY_DIR}/installer/icons
+		)
 	endif()
-
-	include(cmake/packaging.cmake)
 endif()
-- 
cgit v1.2.3