diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 09:00:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 09:00:52 +0200 |
| commit | 2a791c53ad93c8bc1441dd227000234bd49c4990 (patch) | |
| tree | 4c52ad715c99bd3c6681771d7cb77d451a34e216 /win | |
| parent | b5c72a843abee033e9ea6028e1a109f03afc4455 (diff) | |
| parent | 723ffdb32ee785cbc511abc457eb70d41c2fcce3 (diff) | |
| download | mariadb-git-2a791c53ad93c8bc1441dd227000234bd49c4990.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/create_msi.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake index 01bb6505b3f..ad935803a1e 100644 --- a/win/packaging/create_msi.cmake +++ b/win/packaging/create_msi.cmake @@ -367,9 +367,10 @@ IF("$ENV{EXTRA_LIGHT_ARGS}") ENDIF() FILE(REMOVE mysql_server.wixobj extra.wixobj) +STRING(REPLACE " " ";" EXTRA_WIX_PREPROCESSOR_FLAGS_LIST ${EXTRA_WIX_PREPROCESSOR_FLAGS}) EXECUTE_PROCESS( COMMAND ${CANDLE_EXECUTABLE} - ${EXTRA_WIX_PREPROCESSOR_FLAGS} + ${EXTRA_WIX_PREPROCESSOR_FLAGS_LIST} ${CANDLE_ARCH} -ext WixUtilExtension -ext WixFirewallExtension @@ -379,7 +380,7 @@ EXECUTE_PROCESS( EXECUTE_PROCESS( COMMAND ${CANDLE_EXECUTABLE} ${CANDLE_ARCH} - ${EXTRA_WIX_PREPROCESSOR_FLAGS} + ${EXTRA_WIX_PREPROCESSOR_FLAGS_LIST} -ext WixUtilExtension -ext WixFirewallExtension ${CMAKE_CURRENT_BINARY_DIR}/extra.wxs |