diff options
| author | Daniel Black <daniel@mariadb.org> | 2023-01-19 18:48:37 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-19 18:48:40 +1100 |
| commit | 526fce28b907e430513f1fe3f21f00d7bfe7d0fc (patch) | |
| tree | e9250a15c81d5bea2b55cb8b1d6c5ae5a6ac7799 | |
| parent | 43dc3782348b7558cf2cec1eba809f77ed664d08 (diff) | |
| download | mariadb-git-bb-11.0-danielblack-preview-MDEV-30203-fix.tar.gz | |
MDEV-30203: Move mysql symlinks to different package (script fix)bb-11.0-danielblack-preview-MDEV-30203-fix-pkgtestbb-11.0-danielblack-preview-MDEV-30203-fix
Move the scripts/CMakeLists.txt install links into INSTALL_SCRIPT.
As a result the linking of mariadb-install-db isn't needed.
INSTALL_SCRIPT components outside the scripts (like rocksdb)
now get the same attention.
| -rw-r--r-- | cmake/install_macros.cmake | 18 | ||||
| -rw-r--r-- | scripts/CMakeLists.txt | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index bea2d6d7aee..4946e7d71bc 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -71,6 +71,18 @@ FUNCTION(INSTALL_MANPAGES COMP) ENDFOREACH() ENDFUNCTION() +MACRO(INSTALL_LINK old new destination component) + EXECUTE_PROCESS( + COMMAND ${CMAKE_COMMAND} -E create_symlink ${old} ${new} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + INSTALL( + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${new} + DESTINATION ${destination} + COMPONENT ${component} + ) +ENDMACRO() + FUNCTION(INSTALL_SCRIPT) CMAKE_PARSE_ARGUMENTS(ARG "" @@ -90,6 +102,12 @@ FUNCTION(INSTALL_SCRIPT) ENDIF() INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} COMPONENT ${COMP}) + + GET_FILENAME_COMPONENT(target ${script} NAME) + GET_SYMLINK(${target} link) + IF(link) + INSTALL_LINK(${target} ${link} ${ARG_DESTINATION} ${COMP}Symlinks) + ENDIF() ENDFUNCTION() diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 7f9c92f1cf2..0c5b4b0e0fa 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -16,18 +16,6 @@ # Build comp_sql - used for embedding SQL in C or C++ programs -MACRO(INSTALL_LINK old new destination component) - EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -E create_symlink ${old} ${new} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - INSTALL( - PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${new} - DESTINATION ${destination} - COMPONENT ${component} - ) -ENDMACRO() - IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_EXECUTABLE(comp_sql comp_sql.c ../sql/sql_bootstrap.cc) @@ -222,8 +210,6 @@ IF(UNIX AND NOT WITHOUT_SERVER) "${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db" DESTINATION ${INSTALL_SCRIPTDIR} COMPONENT Server) - - INSTALL_LINK(mariadb-install-db mysql_install_db ${INSTALL_SCRIPTDIR} ServerSymlinks) ENDIF() SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -383,10 +369,6 @@ ELSE() EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${file}) ENDIF() - # Create symlink - IF (NOT ${binname} STREQUAL ${file}) - INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}Symlinks) - ENDIF() ENDFOREACH() ENDIF() |