diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-04-19 18:45:54 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-04-19 18:45:54 +0200 |
| commit | 0b034c1b2c619e3de6c8cbaddaede75578b5ef1a (patch) | |
| tree | cbd9ef0be6348e38b0fdc75a6087c5aaa1f46f96 /storage/connect | |
| parent | 9df2057cfa5c080b04db070bdd2992a054a66a65 (diff) | |
| download | mariadb-git-0b034c1b2c619e3de6c8cbaddaede75578b5ef1a.tar.gz | |
Fix to handle CMake component names with dash in the name, when producing MSI package.
Rename connect_engine component back to connect-engine.
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 5541efca880..eae4d9a25bc 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -252,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}) @@ -263,12 +263,12 @@ MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES} IF (INSTALL_SYSCONFDIR) INSTALL(FILES connect.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d - COMPONENT connect_engine) + COMPONENT connect-engine) ENDIF(INSTALL_SYSCONFDIR) IF(RPM) - SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "connect_engine" PARENT_SCOPE) - SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} connect_engine PARENT_SCOPE) + SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "connect-engine" PARENT_SCOPE) + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} connect-engine PARENT_SCOPE) SET(CPACK_RPM_connect_engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) # workarounds for cmake issues #13248 and #12864: |