diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-07-03 15:49:41 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2022-07-03 17:11:56 +0200 |
| commit | 494a75c851949091c9822a200a8a148c48c93c67 (patch) | |
| tree | 74fd219f058c31a7be2a37731e1d09c26b7bb9e9 /cmake | |
| parent | 0c62b6d5652a66fa654e91dd27e0a16433920e5c (diff) | |
| download | mariadb-git-494a75c851949091c9822a200a8a148c48c93c67.tar.gz | |
MDEV-28888 : Embedded MariaDB does not build on Windows
Add limited support for building embedded library (DLL only).
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/libutils.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index f8eaf082448..74853c36a74 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -154,7 +154,11 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) # (can be a static or shared lib) IF(LIB_TYPE STREQUAL "STATIC_LIBRARY") SET(STATIC_TGTS ${STATIC_TGTS} ${LIB}) - SET(STATIC_LIBS ${STATIC_LIBS} $<TARGET_FILE:${LIB}>) + IF(MSVC) + TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${LIB}) + ELSE() + SET(STATIC_LIBS ${STATIC_LIBS} $<TARGET_FILE:${LIB}>) + ENDIF() ADD_DEPENDENCIES(${TARGET} ${LIB}) # Extract dependent OS libraries GET_DEPENDEND_OS_LIBS(${LIB} LIB_OSLIBS) |