database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

MDEV-32745 followup - fix Windows build on a machine without Developer Mode.

Browse Source 
In custom CMake target, do not attempt symlink with hardlink fallback,
this makes VS build fail since stderr is written (and attempts to suppress
stderr fail in Ninja generator)

Just use hardlinks, no substantial difference in the given scenario.
This commit is contained in:
Vladislav Vaintroub
2026-09-01 21:29:57 +02:00
parent 3ff61984f3
commit e2e060ce3d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extra/CMakeLists.txt
View File

@@ -66,18 +66,19 @@ IF(NOT CMAKE_CROSSCOMPILING AND NOT WITH_ASAN AND TARGET mariadbd)
COMMAND ${CMAKE_COMMAND} -E rm -rf "${my_plugin_dir}"
COMMAND ${CMAKE_COMMAND} -E make_directory "${my_plugin_dir}"
)
# Symlinks need a privilege not granted by default on Windows; use hardlinks there.
IF(WIN32)
SET(linktype hard)
ELSE()
SET(linktype sym)
ENDIF()
FOREACH(target ${dynamic_plugins})
LIST(APPEND plugin_load "$<TARGET_FILE_NAME:${target}>")
IF(WIN32)
SET(maybe_create_hardlink || ${CMAKE_COMMAND} -E create_hardlink
$<TARGET_FILE:${target}>
"${my_plugin_dir}/$<TARGET_FILE_NAME:${target}>")
ENDIF()
LIST(APPEND populate_plugin_dir
COMMAND ${CMAKE_COMMAND} -E create_symlink
$<TARGET_FILE:${target}>
"${my_plugin_dir}/$<TARGET_FILE_NAME:${target}>"
${maybe_create_hardlink})
LIST(APPEND populate_plugin_dir
COMMAND ${CMAKE_COMMAND} -E create_${linktype}link
$<TARGET_FILE:${target}>
"${my_plugin_dir}/$<TARGET_FILE_NAME:${target}>")
ENDFOREACH()
IF(NOT plugin_load)