Auto-merge from mysql-5.5.

1 files changed, 16 insertions, 8 deletions

diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index d6725e9ae6c..adc3cf4c4dd 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -10,6 +10,10 @@ SET(MINOR_VERSION "@MINOR_VERSION@")
 SET(PATCH "@PATCH@")

 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)

 SET(MANUFACTURER "@MANUFACTURER@")

+SET(WIXCA_LOCATION "@WIXCA_LOCATION@")

+SET(COPYING_RTF "@COPYING_RTF@")

+SET(CPACK_WIX_CONFIG "@CPACK_WIX_CONFIG@")

+SET(CPACK_WIX_INCLUDE "@CPACK_WIX_INCLUDE@")

 

 IF(CMAKE_SIZEOF_VOID_P EQUAL 8)

   SET(Win64 " Win64='yes'")

@@ -30,7 +34,7 @@ IF(CPACK_WIX_CONFIG)
 ENDIF()

 

 IF(NOT CPACK_WIX_UI)

-  SET(CPACK_WIX_UI "WixUI_Mondo")

+  SET(CPACK_WIX_UI "WixUI_Mondo_Custom")

 ENDIF()

 

 SET(WIX_FEATURES)

@@ -144,15 +148,16 @@ FOREACH(f ${WIX_FEATURES})
 ENDFOREACH()

 

 

+IF(CMAKE_INSTALL_CONFIG_NAME)

+  STRING(REPLACE "${CMAKE_CFG_INTDIR}" "${CMAKE_INSTALL_CONFIG_NAME}" 

+    WIXCA_LOCATION "${WIXCA_LOCATION}")

+  SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")

+ENDIF()

 

 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_server.wxs.in 

  ${CMAKE_CURRENT_BINARY_DIR}/mysql_server.wxs)

  

 

-IF(CMAKE_INSTALL_CONFIG_NAME)

-  SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_INSTALL_CONFIG_NAME}")

-ENDIF()

-

 FOREACH(comp ${CPACK_COMPONENTS_ALL})

  SET(ENV{DESTDIR} testinstall/${comp})

  SET(DIRS ${DIRS} testinstall/${comp})

@@ -262,9 +267,12 @@ FOREACH(d ${DIRS})
   SET(COMP_NAME ${d_name})

   TRAVERSE_FILES(${d} ${d} ${abs}/${d_name}.wxs ${abs}/${d_name}_component_group.wxs "${abs}/dirs")

   FILE(APPEND  ${abs}/${d_name}_component_group.wxs   "</ComponentGroup>")

-  FILE(READ ${d_name}.wxs WIX_TMP)

-  SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")

-  FILE(REMOVE ${d_name}.wxs)

+  IF(EXISTS ${d_name}.wxs)

+    FILE(READ ${d_name}.wxs WIX_TMP)

+    SET(CPACK_WIX_COMPONENTS "${CPACK_WIX_COMPONENTS}\n${WIX_TMP}")

+    FILE(REMOVE ${d_name}.wxs)

+  ENDIF()

+  

   FILE(READ ${d_name}_component_group.wxs WIX_TMP)

  

   SET(CPACK_WIX_COMPONENT_GROUPS "${CPACK_WIX_COMPONENT_GROUPS}\n${WIX_TMP}")