summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-06-15 15:42:14 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-15 20:28:13 +0200
commitb988553c527d0fb55a561dc3a1308052d94ae2a4 (patch)
tree4dd7ade51e709d1e625601ba86bf849ab86bd2c0 /cmake
parent02421aa284bf3ff2c56c0e8d58defe2846824d19 (diff)
downloadmariadb-git-b988553c527d0fb55a561dc3a1308052d94ae2a4.tar.gz
MDEV-7771 missing client plugins when mariadb-shared is not installed
Put client plugins into -common rpm, not -shared. Because they're needed for * all clients that link with shared libmysqlclient (-shared) * our clients from -client rpm, they're statically linked (-client) * the server that acts as a replication slave (-server)
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index bd8d96154b2..b936e2c0983 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -21,11 +21,12 @@ SET(CPACK_COMPONENT_MANPAGESCLIENT_GROUP "client")
SET(CPACK_COMPONENT_README_GROUP "server")
SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
SET(CPACK_COMPONENT_COMMON_GROUP "common")
+SET(CPACK_COMPONENT_CLIENTPLUGINS_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)
+ Common Client SharedLibraries ClientPlugins)
SET(CPACK_RPM_PACKAGE_NAME "MariaDB")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")