diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-29 22:21:19 +0300 |
| commit | e9aaa10c116370ca581bd1b6f7cc360b43938674 (patch) | |
| tree | 49620196fc57cba1180ffee48695618ec1a36417 /win/packaging/create_msi.cmake | |
| parent | 19da9a51ae174785806c87bcc8fa47406af9ed96 (diff) | |
| parent | 38ea795bb622cce6f7178291ed737ca7396a124a (diff) | |
| download | mariadb-git-e9aaa10c116370ca581bd1b6f7cc360b43938674.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'win/packaging/create_msi.cmake')
| -rw-r--r-- | win/packaging/create_msi.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake index 122c25a0d91..58edcef3ef9 100644 --- a/win/packaging/create_msi.cmake +++ b/win/packaging/create_msi.cmake @@ -34,10 +34,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8) 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) ENDIF() |