diff options
| author | Nik Reist <zeroability@tutanota.com> | 2020-11-08 06:26:44 +0300 |
|---|---|---|
| committer | Nik Reist <zeroability@tutanota.com> | 2020-12-12 06:07:25 +0300 |
| commit | 88e17868493b7e08fe3339069c11cbc5c39e62e5 (patch) | |
| tree | 36e49efb3b97795eaf978e4a25a536a6f9734fd8 /CMakeLists.txt | |
| parent | 919f1f7a3f489a1d43475b07b6ae35196889c474 (diff) | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 25 insertions, 5 deletions
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() |