Skip to content

Commit 02183ba

Browse files
committed
Respect WITH_SSL library to link JDBC
Change-Id: If6578ca8d06002252ca430127759cbdfecc2cc53
1 parent ec1ece5 commit 02183ba

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmake/DepFindMySQL.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ function(main)
297297

298298
if(MYSQL_LIB_STATIC)
299299
target_link_libraries(mysql-client-if INTERFACE MySQL::client-static)
300+
target_link_libraries(mysql-client-if INTERFACE SSL::ssl SSL::crypto)
300301
else()
301302
target_link_libraries(mysql-client-if INTERFACE MySQL::client-shared)
302303
endif()
@@ -513,7 +514,7 @@ function(use_mysql_config)
513514

514515
_mysql_conf(config_libs_paths --libs)
515516
string(REGEX MATCHALL " -l[^ ]+" config_libs ${config_libs_paths})
516-
message("-- libs: ${config_libs}")
517+
# message("-- libs: ${config_libs}")
517518

518519

519520
foreach(lib ${config_libs})
@@ -523,9 +524,11 @@ function(use_mysql_config)
523524

524525
# Libraries that are known to be internal compiler ones are not set as
525526
# explicit dependencies.
527+
# Openssl dependency is treated differently, respecting users WITH_SSL
528+
# option.
526529

527530
if(NOT lib MATCHES
528-
"(mysqlclient|libmysql|^stdc|^gcc|^CrunG3|^c$|^statomic)"
531+
"(mysqlclient|libmysql|^stdc|^gcc|^CrunG3|^c$|^statomic|^ssl|^crypto)"
529532
)
530533

531534
list(APPEND MYSQL_EXTERNAL_DEPENDENCIES ${lib})

0 commit comments

Comments
 (0)