diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-25 19:32:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-25 19:32:14 +0200 |
| commit | 181b13d92610d869e9dbcb30a58d8e2563a1e331 (patch) | |
| tree | 47098932d4957e68ce9d541e344a40dcbc6795b8 /storage/cassandra | |
| parent | aaa3ec4acabed9b8620bbef3e24530b68aa261f9 (diff) | |
| download | mariadb-git-181b13d92610d869e9dbcb30a58d8e2563a1e331.tar.gz | |
simplify CMakeLists.txt for cassandra/connect engines
now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | storage/cassandra/cassandra.cnf | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 78cb1f8b7e8..eb3bf7a115a 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -53,19 +53,5 @@ IF(CASSANDRASE_OK) SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE) MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine) - IF (INSTALL_SYSCONFDIR) - INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d - COMPONENT cassandra-engine) - ENDIF(INSTALL_SYSCONFDIR) - - IF(RPM) - SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} cassandra-engine PARENT_SCOPE) - SET(CPACK_RPM_cassandra-engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) - - # workarounds for cmake issues #13248 and #12864: - SET(CPACK_RPM_cassandra-engine_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE) - SET(CPACK_RPM_cassandra-engine_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) - SET(CPACK_RPM_cassandra-engine_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) - ENDIF(RPM) ENDIF(CASSANDRASE_OK) diff --git a/storage/cassandra/cassandra.cnf b/storage/cassandra/cassandra.cnf deleted file mode 100644 index 8f4b3d6f91e..00000000000 --- a/storage/cassandra/cassandra.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[mariadb] -plugin-load-add=ha_cassandra.so |