summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-28 10:04:34 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-28 12:54:01 +0200
commit9c38308d8fa62da5c4be3ed7ad6d6c43fe8e7363 (patch)
tree2c82b237d8fe748a436423d09de8f305790031f8 /cmake
parent414a417e919252d821f4494c5723d0d9210353b6 (diff)
downloadmariadb-git-9c38308d8fa62da5c4be3ed7ad6d6c43fe8e7363.tar.gz
MDEV-10086 no gssapi-server RPM package anymore in 10.1
set CPACK_COMPONENTS_ALL both on the current and parent scope
Diffstat (limited to 'cmake')
-rw-r--r--cmake/plugin.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 88e8da7cdbe..818264f9edf 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -214,7 +214,8 @@ MACRO(MYSQL_ADD_PLUGIN)
ELSE()
SET(ver "")
ENDIF()
- SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} PARENT_SCOPE)
+ SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT})
+ SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} PARENT_SCOPE)
IF (NOT ARG_CLIENT)
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB${ver}" PARENT_SCOPE)