diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-28 21:50:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-28 21:50:00 +0100 |
| commit | 7b5c63856b324281a3b0533b7b90fb6c130fcc66 (patch) | |
| tree | cf7150ac4ac72de333cb624e5a70f058546e9cc5 /win | |
| parent | d9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff) | |
| parent | cb11b3fbe9d4dde776cb8f2c0d6f83a569655efc (diff) | |
| download | mariadb-git-7b5c63856b324281a3b0533b7b90fb6c130fcc66.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index 62ce5f1edd2..db6f57e023d 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -398,9 +398,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 @@ -410,7 +411,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 |