diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
| commit | b81b1943932a383a92bcd22d053e112198507ae2 (patch) | |
| tree | b02d52c43aed34e9320994555ca42fb952fdf10f /support-files | |
| parent | b18241e059c17d4ad533dac3729302aa0ef60345 (diff) | |
| parent | a27bfb2a872ea48a5083c2558bca58dc4358316f (diff) | |
| download | mariadb-git-b81b1943932a383a92bcd22d053e112198507ae2.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 26091e472a3..44ad8d0ae94 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2016, Oracle and/or its affiliates. -# Copyright (c) 2012, 2021, MariaDB +# Copyright (c) 2012, 2022, MariaDB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -64,7 +64,11 @@ ENDIF() IF(UNIX AND NOT WITHOUT_SERVER) SET(prefix ${CMAKE_INSTALL_PREFIX}) - FOREACH(script mysqld_multi.server mariadb.logrotate binary-configure wsrep_notify mini-benchmark) + SET(SCRIPTS mysqld_multi.server mariadb.logrotate binary-configure mini-benchmark) + IF(WITH_WSREP) + SET(SCRIPTS ${SCRIPTS} wsrep_notify) + ENDIF() + FOREACH(script ${SCRIPTS}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${script} @@ -143,7 +147,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) COMMAND ${CMAKE_COMMAND} -E create_symlink ./mariadb.service mysqld.service WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - INSTALL(FILES use_galera_new_cluster.conf + IF(WITH_WSREP) + INSTALL(FILES use_galera_new_cluster.conf + DESTINATION ${inst_location}/systemd COMPONENT SupportFiles) + ENDIF() + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.service ${CMAKE_CURRENT_BINARY_DIR}/mysql.service ${CMAKE_CURRENT_BINARY_DIR}/mysqld.service |