Skip to content

Commit c9b9d9f

Browse files
committed
MDEV-18506 MSI can't be built if MFC package is not installed with Visual Studio
candle.exe's preprocessor flags (-dHaveUpgradeWizard=0 -DHaveInnodb=1) were not passed correctly to EXECUTE_PROCESS Fix is to make a list out of the EXTRA_WIX_PREPROCESSOR_FLAGS string, and use the preprocessor flags list in EXECUTE_PROCESS.
1 parent 9034e5e commit c9b9d9f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

win/packaging/create_msi.cmake.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,10 @@ IF("$ENV{EXTRA_LIGHT_ARGS}")
401401
ENDIF()
402402

403403
FILE(REMOVE mysql_server.wixobj extra.wixobj)
404+
STRING(REPLACE " " ";" EXTRA_WIX_PREPROCESSOR_FLAGS_LIST ${EXTRA_WIX_PREPROCESSOR_FLAGS})
404405
EXECUTE_PROCESS(
405406
COMMAND ${CANDLE_EXECUTABLE}
406-
${EXTRA_WIX_PREPROCESSOR_FLAGS}
407+
${EXTRA_WIX_PREPROCESSOR_FLAGS_LIST}
407408
${CANDLE_ARCH}
408409
-ext WixUtilExtension
409410
-ext WixFirewallExtension
@@ -413,7 +414,7 @@ EXECUTE_PROCESS(
413414

414415
EXECUTE_PROCESS(
415416
COMMAND ${CANDLE_EXECUTABLE} ${CANDLE_ARCH}
416-
${EXTRA_WIX_PREPROCESSOR_FLAGS}
417+
${EXTRA_WIX_PREPROCESSOR_FLAGS_LIST}
417418
-ext WixUtilExtension
418419
-ext WixFirewallExtension
419420
${CMAKE_CURRENT_BINARY_DIR}/extra.wxs

0 commit comments

Comments
 (0)