diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-03-01 15:52:06 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-03-01 15:52:06 +0100 |
| commit | f2e1451740d417f1c9ea8626d937fbcacc91bb55 (patch) | |
| tree | cd915badee79727c047208a7804181543cdb9c27 /win | |
| parent | e39d6e0c53bccaf0c6b2a0341f8deb420f5e79be (diff) | |
| parent | 2d34713294d5339d1459911a46fa20395443b3c7 (diff) | |
| download | mariadb-git-f2e1451740d417f1c9ea8626d937fbcacc91bb55.tar.gz | |
Merge branch '10.0' into 10.1
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 |