Fix MYSQL_PLUGIN_DIR

silvakid · silvakid · commit d22046ee7830 · 2020-07-01T23:26:11.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -410,7 +410,7 @@ if(BUNDLE_DEPENDENCIES)
 
   endforeach()
 
-  file(GLOB _bundled "${MYSQL_LIB_DIR}/plugin/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
+  file(GLOB _bundled "${MYSQL_PLUGIN_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
 
   foreach(lib ${_bundled})
 
diff --git a/cmake/DepFindMySQL.cmake b/cmake/DepFindMySQL.cmake
@@ -152,6 +152,11 @@ function(main)
     FORCE
   )
 
+  set(MYSQL_PLUGIN_DIR "${MYSQL_PLUGIN_DIR}"
+    CACHE PATH "Path to MYSQL plugin libraries (computed)."
+    FORCE
+  )
+
 
   #
   # Searching for library.

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,11 @@ function(main)`
`152`	`152`	`FORCE`
`153`	`153`	`)`
`154`	`154`
	`155`	`+ set(MYSQL_PLUGIN_DIR "${MYSQL_PLUGIN_DIR}"`
	`156`	`+ CACHE PATH "Path to MYSQL plugin libraries (computed)."`
	`157`	`+ FORCE`
	`158`	`+ )`
	`159`	`+`
`155`	`160`
`156`	`161`	`#`
`157`	`162`	`# Searching for library.`