diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-06-15 18:27:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-06-17 12:26:26 +0200 |
| commit | 306e439c6d19b578fdd12b640a6f9a81ed2737e1 (patch) | |
| tree | c342ad9d3d7e9089fd72e652331f7abe6e3711ca /cmake/mysql_add_executable.cmake | |
| parent | 24503d5711677ce77617e3ff2514a4838e95eac7 (diff) | |
| download | mariadb-git-306e439c6d19b578fdd12b640a6f9a81ed2737e1.tar.gz | |
MDEV-17592 Create MariaDB named commands/symlinks
post-merge fixes:
* .gitignore
* don't put the keyword COMPONENT into ${COMP} anymore
* don't alias mytop, but do alias mysql_client_test
* don't symlink manpages, use troff aliasing technique instead
(symlinked manpages break rpm and out-of-source bintar builds)
* move debian to use troff aliased manpages, fix typos in debian files,
put aliases in the correct packages, add more aliases to match
rpm/bintar packaging
Diffstat (limited to 'cmake/mysql_add_executable.cmake')
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index d894ee2de9a..54fdab7b17c 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -70,16 +70,16 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) SET(ARG_DESTINATION ${INSTALL_BINDIR}) ENDIF() IF(ARG_COMPONENT) - SET(COMP COMPONENT ${ARG_COMPONENT}) + SET(COMP ${ARG_COMPONENT}) ELSEIF(MYSQL_INSTALL_COMPONENT) - SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT}) + SET(COMP ${MYSQL_INSTALL_COMPONENT}) ELSE() - SET(COMP COMPONENT Client) + SET(COMP Client) ENDIF() IF (COMP MATCHES ${SKIP_COMPONENTS}) RETURN() ENDIF() - MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP}) + MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP}) ENDIF() # create mariadb named symlink |