Skip to content

Commit a693664

Browse files
committed
cmake: Ignore new libraries bundled with 8.4.0 server, find SASL plugins in a new location on Win
1 parent 17087e2 commit a693664

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

jdbc/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ set(IGNORED_PLUGINS
480480
)
481481

482482
set(IGNORED_LIBS
483+
libabsl abseil_dll # Since 8.4.0
484+
libpolyglot # present on MacOS since 8.4.0
483485
libmysql lber libprotobuf
484486
ldap # note: this is needed only by server-side plugin
485487
libcurl libmecab zlib
@@ -579,7 +581,10 @@ macro(bundle_libs to_bundle ignored)
579581
# On windows, libs are in bin directory
580582

581583
if(WIN32)
582-
file(GLOB _bundled1 "${MYSQL_LIB_DIR}/../bin/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
584+
file(GLOB _bundled1
585+
"${MYSQL_LIB_DIR}/../bin/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
586+
"${MYSQL_LIB_DIR}/../bin/sasl2/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
587+
)
583588
endif()
584589

585590
endif()

0 commit comments

Comments
 (0)