diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-06 09:51:35 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-06 09:51:35 +0000 |
| commit | d235782fca0e3ffd70cf84d466b0c8059ceecdbb (patch) | |
| tree | 872b84bcca65de99daccfe5c61cd1824d383155c | |
| parent | 1494147cf6f810dfd2a87c93be53e3c9da3a0958 (diff) | |
| parent | b666732182b34d30c5ada8da37835ec388cc077a (diff) | |
| download | mariadb-git-d235782fca0e3ffd70cf84d466b0c8059ceecdbb.tar.gz | |
Merge branch '10.1' into 10.2
| -rw-r--r-- | cmake/plugin.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 16da44311b6..bca488e66c9 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -201,11 +201,13 @@ 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(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) + 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() IF(ARG_LINK_LIBRARIES) |