diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 19:14:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 19:14:43 +0100 |
| commit | 6f2680a73c54a5c676f80f6b86c1985aced1dfe4 (patch) | |
| tree | fddb2a6acc72a71f7be02cd01cfe9598f25c04e0 | |
| parent | 97d3402b9c2260134d317e743f47c9bb29c27c2e (diff) | |
| download | mariadb-git-6f2680a73c54a5c676f80f6b86c1985aced1dfe4.tar.gz | |
move cassandra-related code from cmake/cpack_rpm.cmake
to storage/cassandra/CMakeLists.txt
| -rw-r--r-- | cmake/cpack_rpm.cmake | 4 | ||||
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 40e71e68e5b..056366e6ee6 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -20,13 +20,12 @@ SET(CPACK_COMPONENT_CLIENT_GROUP "client") SET(CPACK_COMPONENT_MANPAGESCLIENT_GROUP "client") SET(CPACK_COMPONENT_README_GROUP "server") SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared") -SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "CassandraSE") SET(CPACK_COMPONENT_COMMON_GROUP "common") SET(CPACK_COMPONENT_COMPAT_GROUP "compat") SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts SupportFiles Development ManPagesDevelopment ManPagesTest Readme ManPagesClient Test - Common Client SharedLibraries CassandraSE) + Common Client SharedLibraries) SET(CPACK_RPM_PACKAGE_NAME "MariaDB") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") @@ -64,7 +63,6 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE} ") SET(CPACK_RPM_PACKAGE_REQUIRES "MariaDB-common") -SET(CPACK_RPM_CassandraSE_PACKAGE_REQUIRES "MariaDB-server") SET(ignored "%ignore /etc" diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 251cfe65e6b..dbccc2eb127 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -53,4 +53,16 @@ IF(CASSANDRASE_OK) INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d COMPONENT CassandraSE) ENDIF(INSTALL_SYSCONFDIR) + + IF(RPM) + SET(CPACK_COMPONENT_CASSANDRASELIBRARIES_GROUP "CassandraSE" PARENT_SCOPE) + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} CassandraSE PARENT_SCOPE) + SET(CPACK_RPM_CassandraSE_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) + + # workarounds for cmake issues #13248 and #12864: + SET(CPACK_RPM_CassandraSE_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE) + SET(CPACK_RPM_CassandraSE_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) + SET(CPACK_RPM_CassandraSE_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) + ENDIF(RPM) + ENDIF(CASSANDRASE_OK) |