diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:09:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:09:01 +0200 |
| commit | b7ae4d442aa32752798f1d3b6122c35c4ebe2d07 (patch) | |
| tree | 8389a43f1db8c01fbc016e07208b111bee428177 /support-files | |
| parent | f124d71ab75e0d449eb80fb909fa3b0ac4b191a8 (diff) | |
| parent | 4783f37cf79150db55a7258683e50a04d987af1d (diff) | |
| download | mariadb-git-b7ae4d442aa32752798f1d3b6122c35c4ebe2d07.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index e0ea78e282e..f4cc5f265a5 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -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) + SET(SCRIPTS mysqld_multi.server mysql-log-rotate binary-configure) + 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 |