@@ -474,33 +474,44 @@ function(bundle_dependencies)
474
474
475
475
install (FILES ${CLIENT_PLUGINS}
476
476
DESTINATION "${INSTALL_LIB_DIR} /plugin"
477
- COMPONENT ClientDlls
477
+ COMPONENT ClientDll
478
478
)
479
479
480
480
# List of libraries needed to bundle with plugins
481
481
SET (dep_list "com_err" "gssapi_krb5" "k5crypto" "krb5" "krb5support" "sasl" )
482
482
483
483
message ("PLUGINS_DEPENDENCIES: ${dep_list} " )
484
484
foreach (lib_name ${dep_list} )
485
- message ("DEPENDENCY: ${_lib} " )
486
- file (GLOB_RECURSE depepdency_path
485
+
486
+ message ("DEPENDENCY: ${lib_name} " )
487
+
488
+ file (GLOB_RECURSE depepdencies_path
487
489
"${MYSQL_PLUGIN_DIR} /*${lib_name} *"
488
490
"${MYSQL_LIB_DIR} /*${lib_name} *"
489
491
)
490
492
491
- if (depepdency_path )
492
- message ("DEPENDENCY_PATH: ${depepdency_path} " )
493
- if (WIN32 )
494
- install (FILES ${depepdency_path}
495
- DESTINATION "${INSTALL_LIB_DIR} /plugin"
496
- COMPONENT ClientDlls
497
- )
498
- else ()
499
- install (FILES ${depepdency_path}
500
- DESTINATION "${INSTALL_LIB_DIR} /private"
501
- COMPONENT ClientDlls
502
- )
503
- endif ()
493
+ if (depepdencies_path )
494
+ message ("DEPENDENCIES PATHS: ${depepdencies_path} " )
495
+ foreach (lib_path ${depepdencies_path} )
496
+ message ("DEPENDENCY PATH: ${lib_path} " )
497
+ #auth plugins are also found using sasl keyword
498
+ #skip them
499
+ if (lib_path MATCHES ".*authentication.*" )
500
+ message ("SKIP" )
501
+ continue ()
502
+ endif ()
503
+ if (WIN32 )
504
+ install (FILES ${lib_path}
505
+ DESTINATION "${INSTALL_LIB_DIR} /plugin"
506
+ COMPONENT ClientDll
507
+ )
508
+ else ()
509
+ install (FILES ${lib_path}
510
+ DESTINATION "${INSTALL_LIB_DIR} /private"
511
+ COMPONENT ClientDll
512
+ )
513
+ endif ()
514
+ endforeach ()
504
515
505
516
endif ()
506
517
unset (depepdency_path CACHE )
0 commit comments