summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-11-27 15:49:09 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-11-27 15:58:06 +0100
commit96c6b2b64926b7c2d57ce0a85d11039d062dfc3b (patch)
tree4dcecdd06f0e635b988e95ef951b5251ff993366 /cmake
parented355f59dd7e0065ebde15223c2f39f8b71b2958 (diff)
downloadmariadb-git-96c6b2b64926b7c2d57ce0a85d11039d062dfc3b.tar.gz
MDEV-19781 fixups
- It is not enough to have and DeleteSymlinks actions because within the same installation some exes executables can be both added and removed, which needs both adding and removing some symlinks. Instead of CreateSymlinks, there is now FixSymlinks function, which goes through the list, and adds or removes the symlinks as needed. - Implemented rollback for symlink custom action. - Generate list of symlinks in C++ file, using CMake, rather than storing lists as MSI properties.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/symlinks.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/symlinks.cmake b/cmake/symlinks.cmake
index 251532892c2..ec638bc82de 100644
--- a/cmake/symlinks.cmake
+++ b/cmake/symlinks.cmake
@@ -1,4 +1,8 @@
# Create lists
+if(COMMAND REGISTER_SYMLINK)
+ return()
+endif()
+
macro(REGISTER_SYMLINK from to)
list(APPEND MARIADB_SYMLINK_FROMS ${from})
list(APPEND MARIADB_SYMLINK_TOS ${to})