diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-13 05:52:44 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-13 05:52:44 +0400 |
| commit | 949faa2ec24999ce35c558433d5932805542e278 (patch) | |
| tree | 252877067ef28138a8e29d9b582433ffb5298710 /cmake | |
| parent | 012fbc15cfbd34c218ae50f553d2e2e32301da01 (diff) | |
| parent | eecce3d7c8a6374342ed7d0cd8844420d8957682 (diff) | |
| download | mariadb-git-949faa2ec24999ce35c558433d5932805542e278.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index edbd2065f82..354ee53c7bb 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -201,9 +201,15 @@ MACRO(MYSQL_ADD_PLUGIN) # executable to the linker command line (it would result into link error). # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate # an additional dependency. - IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ARG_CLIENT) - TARGET_LINK_LIBRARIES (${target} mysqld) + IF(NOT ARG_CLIENT) + IF(MSVC) + ADD_DEPENDENCIES(${target} gen_mysqld_lib) + TARGET_LINK_LIBRARIES(${target} mysqld_import_lib) + ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") + TARGET_LINK_LIBRARIES (${target} mysqld) + ENDIF() ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) SET_TARGET_PROPERTIES(${target} PROPERTIES |