diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-01-26 17:56:41 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-01-26 17:56:41 +0100 |
| commit | a095c99301a0acac9b2db9b294f24a8753ebed48 (patch) | |
| tree | 0d49cc931650dbc47818fcc958ae10ac870f49e5 /cmake | |
| parent | 7831b79f447095074167c2aafd02f8e8177fc4f5 (diff) | |
| download | mariadb-git-a095c99301a0acac9b2db9b294f24a8753ebed48.tar.gz | |
Fix packaging for client RPM plugins - provide 'ignored' list
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index cd4e4faaaf0..cd02bcfc4be 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -216,13 +216,13 @@ MACRO(MYSQL_ADD_PLUGIN) # workarounds for cmake issues #13248 and #12864: SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) - - IF(NOT ARG_CLIENT AND NOT ARG_CONFIG AND UNIX) + SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE) + IF(NOT ARG_CLIENT AND NOT ARG_CONFIG AND UNIX) SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf") FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n") - INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR}) - SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE) - ENDIF() + INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR}) + SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE) + ENDIF() ENDIF() ELSE() SET(ARG_COMPONENT Server) |