diff options
| author | Rasmus Johansson <rasmus@mariadb.com> | 2020-03-23 13:11:51 +0000 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-24 02:39:32 +0100 |
| commit | 79b8901711e73fd8b18463d27367ca2d7960534d (patch) | |
| tree | 815b4064a67b1ba441c35059a17fae6a5ed3cdfb | |
| parent | e4afd3c337c2b4816d76fbdb5d0624da41293fc5 (diff) | |
| download | mariadb-git-79b8901711e73fd8b18463d27367ca2d7960534d.tar.gz | |
MDEV-22009 mysqlhotcopy tool and wsrep scripts not found
main.mysqlhotcopy_myisam cannot find mysqlhotcopy tool
wsrep scripts are not executable in CMAKE_CURRENT_BINARY_DIR
| -rw-r--r-- | scripts/CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index d900b55ecf1..38f44796148 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -212,7 +212,7 @@ SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db ESCAPE_QUOTES @ONLY) - + EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db) INSTALL_SCRIPT( "${CMAKE_CURRENT_BINARY_DIR}/mariadb-install-db" DESTINATION ${INSTALL_SCRIPTDIR} @@ -336,19 +336,28 @@ ELSE() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${binname} ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) ELSE() - MESSAGE(FATAL_ERROR "Can not find ${binname}.sh or ${binname} in " + MESSAGE(FATAL_ERROR "Cannot find ${binname}.sh or ${binname} in " "${CMAKE_CURRENT_SOURCE_DIR}" ) ENDIF() IF(NOT ${file}_COMPONENT) SET(${file}_COMPONENT Server) ENDIF() + + # install script INSTALL_SCRIPT( ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${INSTALL_BINDIR} COMPONENT ${${file}_COMPONENT} ) + # make scripts executable in build dir + IF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${binname}) + EXECUTE_PROCESS(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/${binname}) + ELSEIF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${file}) + 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}) @@ -366,7 +375,7 @@ ELSE() ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${INSTALL_BINDIR} COMPONENT ${${file}_COMPONENT} - ) + ) ENDFOREACH() ENDIF() |