MDEV-10086 no gssapi-server RPM package anymore in 10.1

set CPACK_COMPONENTS_ALL both on the current and parent scope

MDEV-10086 no gssapi-server RPM package anymore in 10.1
set CPACK_COMPONENTS_ALL both on the current and parent scope
9c38308d · Sergei Golubchik · 414a417e · 9c38308d
Commit 9c38308d authored Jun 28, 2016 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cmake/plugin.cmake cmake/plugin.cmake +2 -1

No files found.
--- 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)