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 | |
| 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')
| -rw-r--r-- | cmake/install_macros.cmake | 8 | ||||
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 8 | ||||
| -rw-r--r-- | cmake/symlinks.cmake | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index a4ba10c28e5..f04ab691af1 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -101,17 +101,13 @@ FUNCTION(INSTALL_SCRIPT) IF(NOT ARG_DESTINATION) SET(ARG_DESTINATION ${INSTALL_BINDIR}) ENDIF() - IF(ARG_COMPONENT) - SET(COMP COMPONENT ${ARG_COMPONENT}) - ELSE() - SET(COMP) - ENDIF() + SET(COMP ${ARG_COMPONENT}) IF (COMP MATCHES ${SKIP_COMPONENTS}) RETURN() ENDIF() - INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} ${COMP}) + INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP}) get_filename_component(dest "${script}" NAME) CREATE_MARIADB_SYMLINK(${dest} ${ARG_DESTINATION} ${COMP}) 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 diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake index 8fbdc93e869..251532892c2 100644 --- a/cmake/symlinks.cmake +++ b/cmake/symlinks.cmake @@ -12,6 +12,7 @@ REGISTER_SYMLINK("mariabackup" "mariadb-backup") REGISTER_SYMLINK("mysqlbinlog" "mariadb-binlog") REGISTER_SYMLINK("mysqlcheck" "mariadb-check") REGISTER_SYMLINK("mysql_client_test_embedded" "mariadb-client-test-embedded") +REGISTER_SYMLINK("mysql_client_test" "mariadb-client-test") REGISTER_SYMLINK("mariadb_config" "mariadb-config") REGISTER_SYMLINK("mysql_convert_table_format" "mariadb-convert-table-format") REGISTER_SYMLINK("mysqldump" "mariadb-dump") @@ -30,7 +31,6 @@ REGISTER_SYMLINK("mysqlshow" "mariadb-show") REGISTER_SYMLINK("mysqlslap" "mariadb-slap") REGISTER_SYMLINK("mysqltest" "mariadb-test") REGISTER_SYMLINK("mysqltest_embedded" "mariadb-test-embedded") -REGISTER_SYMLINK("mytop" "mariadb-top") REGISTER_SYMLINK("mysql_tzinfo_to_sql" "mariadb-tzinfo-to-sql") REGISTER_SYMLINK("mysql_upgrade" "mariadb-upgrade") REGISTER_SYMLINK("mysql_upgrade_service" "mariadb-upgrade-service") @@ -59,7 +59,7 @@ endmacro(CREATE_MARIADB_SYMLINK) macro(CREATE_MARIADB_SYMLINK_IN_DIR src dest dir comp) if(UNIX) add_custom_target( - symlink_${dest}_${comp} ALL + SYM_${dest} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dest} ) |