diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-04-17 07:44:49 -0700 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-04-17 07:44:49 -0700 |
| commit | 4a3e22c430149b887545acfd5f792c03b39e27a9 (patch) | |
| tree | aaf52637084015a0f0d3df8c34d6913f9addc37e /win | |
| parent | 2a20ab78893997eb9df6ee7510f96bf093a5a29c (diff) | |
| download | mariadb-git-4a3e22c430149b887545acfd5f792c03b39e27a9.tar.gz | |
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.
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CPackWixConfig.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
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")
|