Merge branch '10.1' into 10.2

MariaDB · Apr 6, 2017 · d235782 · d235782
2 parents 1494147 + b666732
commit d235782
Showing 1 changed file with 7 additions and 5 deletions.
diff --git 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)