diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:12:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:12:07 +0200 |
| commit | 0751bfbcaf08c7c32de8d90b41b6c50ab525da6f (patch) | |
| tree | 173dc7068b1803f6076b7fe56dd259b435f79be5 /support-files | |
| parent | 6f854d7cfee883cba95602760b71e3a368fe39f4 (diff) | |
| parent | b7ae4d442aa32752798f1d3b6122c35c4ebe2d07 (diff) | |
| download | mariadb-git-0751bfbcaf08c7c32de8d90b41b6c50ab525da6f.tar.gz | |
Merge 10.7 into 10.8
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 9623440f110..cff67fd110f 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 @@ -51,7 +51,11 @@ ENDIF() IF(UNIX AND NOT WITHOUT_SERVER) SET(prefix ${CMAKE_INSTALL_PREFIX}) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify mini-benchmark) + SET(SCRIPTS mysqld_multi.server mysql-log-rotate 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} @@ -130,7 +134,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 |