diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-11 14:39:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-18 10:12:23 +0200 |
| commit | 79ddd86615e387f53c973a0cac34ae077655ccea (patch) | |
| tree | b40189b4cc310694f99b705b196eb39dee7e1d94 /cmake | |
| parent | bba169b984fdee72e7e727696ff0f921acae07e0 (diff) | |
| download | mariadb-git-79ddd86615e387f53c973a0cac34ae077655ccea.tar.gz | |
bugfix: don't overwrite tokudb.cnf during the build
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index e6bb64b19c6..df3115bc8f3 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -235,9 +235,11 @@ MACRO(MYSQL_ADD_PLUGIN) SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE) 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") + IF(NOT ARG_CLIENT AND UNIX) + IF (NOT ARG_CONFIG) + SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf") + FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n") + 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() |