diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-06 08:53:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-06 08:53:59 +0300 |
| commit | 8d4871a95340dc1b9bac67115ddf77f484de41c6 (patch) | |
| tree | b6deb55424f4ca86dd779cdd6a708f012d98131f /cmake | |
| parent | cd494f4cefb36faa9e4fa343050a30201d4bdebd (diff) | |
| parent | 57a699b0a0f3300404948775356d31fb478e80c6 (diff) | |
| download | mariadb-git-8d4871a95340dc1b9bac67115ddf77f484de41c6.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 3fbb19381bc..53969f3a13c 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -201,9 +201,16 @@ 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) + 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() + + IF(ARG_LINK_LIBRARIES) + TARGET_LINK_LIBRARIES (${target} ${ARG_LINK_LIBRARIES}) + ENDIF() ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) SET_TARGET_PROPERTIES(${target} PROPERTIES |