diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 14:09:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 14:09:09 +0200 |
| commit | 3e5b21067b2a2489a59376b9f66abf1eaf63fc27 (patch) | |
| tree | da72d0ab7ed6bf7e0762b73454eaae88528b4c9c /cmake | |
| parent | 5b2e3b01f07e6b82e47a18c977d77eccfcd1ca13 (diff) | |
| download | mariadb-git-3e5b21067b2a2489a59376b9f66abf1eaf63fc27.tar.gz | |
MariaDB-tokudb-engine.rpm
cmake/plugin.cmake:
* auto-create an rpm for a plugin, if it places itself in a new component
storage/tokudb/CMakeLists.txt:
install tokudb in COMPONENT tokudb-engine.
this automatically creates a separate rpm for it.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index b06d6ac9ca3..afc359d1d09 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -207,7 +207,17 @@ MACRO(MYSQL_ADD_PLUGIN) SET_TARGET_PROPERTIES(${target} PROPERTIES OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") # Install dynamic library - IF(NOT ARG_COMPONENT) + IF(ARG_COMPONENT) + IF(RPM AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}) + SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} PARENT_SCOPE) + SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE) + + # workarounds for cmake issues #13248 and #12864: + SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE) + SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) + SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) + ENDIF() + ELSE() SET(ARG_COMPONENT Server) ENDIF() MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT}) |