diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-07-13 21:37:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-07-19 11:35:38 +0200 |
| commit | 33eccb577657a127a877cea53ee4dc41cb4604c2 (patch) | |
| tree | dee37b5c7a1f50248685b2e1c4190f87359ff906 /sql/share | |
| parent | bd5cf02bbe7bce029b0275be1b15d2108806d5e9 (diff) | |
| download | mariadb-git-33eccb577657a127a877cea53ee4dc41cb4604c2.tar.gz | |
MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper
Don't install server files if WITHOUT_SERVER is specified.
"Server files" are defined as files going into the MariaDB-Server RPM,
that is files in the components Server, ManPagesServer, Server_Scripts,
IniFiles, SuportFiles, and Readme.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt index e0d5fb6c1a7..4293c0b528c 100644 --- a/sql/share/CMakeLists.txt +++ b/sql/share/CMakeLists.txt @@ -44,12 +44,14 @@ SET(files errmsg-utf8.txt ) -FOREACH (dir ${dirs}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server) -ENDFOREACH() INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Common PATTERN "languages.html" EXCLUDE ) -INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server) +IF (NOT WITHOUT_SERVER) + FOREACH (dir ${dirs}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${dir} + DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server) + ENDFOREACH() + INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server) +ENDIF() |