diff options
Diffstat (limited to 'win/packaging/create_msi.cmake')
-rw-r--r-- | win/packaging/create_msi.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake index 58edcef3ef9..f992915cd22 100644 --- a/win/packaging/create_msi.cmake +++ b/win/packaging/create_msi.cmake @@ -1,3 +1,4 @@ + MACRO(MAKE_WIX_IDENTIFIER str varname) STRING(REPLACE "/" "." ${varname} "${str}") STRING(REGEX REPLACE "[^a-zA-Z_0-9.]" "_" ${varname} "${${varname}}") @@ -61,6 +62,11 @@ IF(CMAKE_INSTALL_CONFIG_NAME) SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}") ENDIF() +IF((MSVC_CRT_TYPE MATCHES "/MD") AND (NOT VCRedist_MSM)) + # Something was wrong, we package VC runtime merge modules + # when compiled with dynamic C runtime. + MESSAGE(FATAL_ERROR "Redistributable merge module was not found") +ENDIF() SET(COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}") FOREACH(comp ${COMPONENTS_ALL}) @@ -384,9 +390,13 @@ EXECUTE_PROCESS( ${EXTRA_CANDLE_ARGS} ) +IF(VCRedist_MSM) + SET(SILENCE_VCREDIST_MSM_WARNINGS -sice:ICE82 -sice:ICE03) +ENDIF() + EXECUTE_PROCESS( COMMAND ${LIGHT_EXECUTABLE} -v -ext WixUIExtension -ext WixUtilExtension - -ext WixFirewallExtension -sice:ICE61 + -ext WixFirewallExtension -sice:ICE61 ${SILENCE_VCREDIST_MSM_WARNINGS} mysql_server.wixobj extra.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi ${EXTRA_LIGHT_ARGS} ) |