diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-06-07 16:50:55 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-06-07 23:15:36 +0200 |
| commit | 4927bf25346229ed5be936575daa29e38eb895de (patch) | |
| tree | edeaada692e691f32707324d2832bf022e488401 /win/packaging/create_msi.cmake | |
| parent | 5ba4c4200ce1f9bce8c2fc1de5d97a131d3c2f37 (diff) | |
| download | mariadb-git-4927bf25346229ed5be936575daa29e38eb895de.tar.gz | |
MDEV-25870 Windows - MSI generation cleanup, fix ARM64
- Support building ARM64 packages
- require InstallerVersion 5.0 -required for arm64, also
it is there already on Windows 7
Diffstat (limited to 'win/packaging/create_msi.cmake')
| -rw-r--r-- | win/packaging/create_msi.cmake | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake index cb1a9654987..ab88c7fbc50 100644 --- a/win/packaging/create_msi.cmake +++ b/win/packaging/create_msi.cmake @@ -30,15 +30,12 @@ FOREACH(third_party ${WITH_THIRD_PARTY}) ENDFOREACH() +SET(CANDLE_ARCH -arch ${Platform}) IF(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(CANDLE_ARCH -arch x64) SET(Win64 " Win64='yes'") - SET(Platform x64) SET(PlatformProgramFilesFolder ProgramFiles64Folder) SET(CA_QUIET_EXEC CAQuietExec64) ELSE() - SET(CANDLE_ARCH -arch x86) - SET(Platform x86) SET(PlatformProgramFilesFolder ProgramFilesFolder) SET(CA_QUIET_EXEC CAQuietExec) SET(Win64) |