From 4a3e22c430149b887545acfd5f792c03b39e27a9 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 17 Apr 2013 07:44:49 -0700 Subject: [PATCH] Fix MSI package creation for connect engine. Also, do not use /MP option when compiling CONNECT (incompatible with COM #import directive) Also, fix ODBC_LIBRARY to be a list on Windows, not string with spaces inside. --- storage/connect/CMakeLists.txt | 8 ++++++-- win/packaging/CPackWixConfig.cmake | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index d5f1e5b16ba..7ad51f42176 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -117,6 +117,10 @@ ENDIF(CONNECT_WITH_LIBXML2) IF(WIN32) + # /MP option of the Microsoft compiler does not work well with COM #import + string(REPLACE "/MP" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + string(REPLACE "/MP" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON) IF(CONNECT_WITH_MSXML) find_library(MSXML_LIBRARY @@ -234,7 +238,7 @@ IF(CONNECT_WITH_ODBC) ENDIF() ELSE(NOT UNIX) add_definitions(-DODBC_SUPPORT) - SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib") + SET(ODBC_LIBRARY odbc32.lib odbccp32.lib) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp tabodbc.h odbccat.h odbconn.cpp odbconn.h) ENDIF(UNIX) @@ -248,7 +252,7 @@ ENDIF(CONNECT_WITH_ODBC) MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES} STORAGE_ENGINE MODULE_OUTPUT_NAME "ha_connect" - COMPONENT connect-engine + COMPONENT connect_engine LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY} ${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY}) diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake index 356d6ef4b89..e363fb97a28 100644 --- a/win/packaging/CPackWixConfig.cmake +++ b/win/packaging/CPackWixConfig.cmake @@ -9,7 +9,7 @@ IF(ESSENTIALS) ENDIF() ELSE() SET(CPACK_COMPONENTS_USED - "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common") + "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common;connect_engine") ENDIF() SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents") @@ -62,6 +62,12 @@ SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server") SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" ) SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1) + #Subfeature "Connect Engine" + SET(CPACK_COMPONENT_CONNECT_ENGINE_GROUP "MySQLServer") + SET(CPACK_COMPONENT_CONNECT_ENGINE_DISPLAY_NAME "Server data files") + SET(CPACK_COMPONENT_CONNECT_ENGINE_DESCRIPTION "Server data files" ) + SET(CPACK_COMPONENT_CONNECT_ENGINE_HIDDEN 1) + #Feature "Devel" SET(CPACK_COMPONENT_GROUP_DEVEL_DISPLAY_NAME "Development Components")