Commit 3e5b2106 authored by Sergei Golubchik's avatar Sergei Golubchik

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.
parent 5b2e3b01
...@@ -207,7 +207,17 @@ MACRO(MYSQL_ADD_PLUGIN) ...@@ -207,7 +207,17 @@ MACRO(MYSQL_ADD_PLUGIN)
SET_TARGET_PROPERTIES(${target} PROPERTIES SET_TARGET_PROPERTIES(${target} PROPERTIES
OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")
# Install dynamic library # 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) SET(ARG_COMPONENT Server)
ENDIF() ENDIF()
MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT}) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT})
......
...@@ -44,5 +44,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/toku_include) ...@@ -44,5 +44,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/toku_include)
SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb") SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
SET(TOKUDB_SOURCES ha_tokudb.cc) SET(TOKUDB_SOURCES ha_tokudb.cc)
MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
COMPONENT "tokudb-engine"
LINK_LIBRARIES tokufractaltree_static tokuportability_static z stdc++) LINK_LIBRARIES tokufractaltree_static tokuportability_static z stdc++)
SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
...@@ -59,7 +59,8 @@ add_subdirectory(toku_include) ...@@ -59,7 +59,8 @@ add_subdirectory(toku_include)
install( install(
FILES README.md README-TOKUDB FILES README.md README-TOKUDB
DESTINATION . COMPONENT "tokudb-engine"
DESTINATION "${INSTALL_DOCREADMEDIR}/tokudb"
) )
## build tags ## build tags
......
...@@ -103,7 +103,8 @@ target_link_libraries(ftverify m) ...@@ -103,7 +103,8 @@ target_link_libraries(ftverify m)
install( install(
TARGETS tokuftdump TARGETS tokuftdump
DESTINATION bin COMPONENT "tokudb-engine"
DESTINATION ${INSTALL_BINDIR}
) )
add_subdirectory(tests) add_subdirectory(tests)
install( install(
FILES tdb-internal.h FILES tdb-internal.h
DESTINATION include DESTINATION ${INSTALL_INCLUDEDIR}
) )
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment