Skip to content

Commit 62e5f03

Browse files
committed
Remove WolfSSL support.
After this connector can't have a built-in SSL support so the link_test target must always handle the dependency on OpenSSL.
1 parent 3ba0fb7 commit 62e5f03

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

link_test/CMakeLists.txt

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,9 @@ endif()
5454
# BUILD_STATIC whether to link with connector statically
5555
# or dynamically (the default)
5656
#
57-
# WITH_SSL tells if connector uses built-in SSL implementation
58-
# or relies on external OpenSSL libraries (*)
59-
#
6057
# WITH_BOOST where to look for Boost if can not be found
6158
# at standard locations.
6259
#
63-
# *) If WITH_SSL is set to "builtin" or if it points at WoflSSL sources then
64-
# it is assumed that connector has SSL support built-in. In all other cases
65-
# it is assumed that connector uses OpenSSL libraries.
66-
#
6760
# Note: Either WITH_CONCPP or CONCPP_INCLUDE_DIR and CONCPP_LIB_DIR must be
6861
# set.
6962
#
@@ -129,18 +122,6 @@ if(NOT CONCPP_INCLUDE_DIR OR NOT CONCPP_LIB_DIR)
129122
endif()
130123

131124

132-
set(WITH_SSL $ENV{WITH_SSL} CACHE STRING
133-
"Set to 'builtin' if connector was built with built-in SSL support"
134-
)
135-
136-
if(NOT WITH_SSL)
137-
# Set to the default if WITH_SSL is not defined
138-
set(WITH_SSL "system")
139-
elseif(EXISTS "${WITH_SSL}/wolfssl/openssl/ssl.h")
140-
set(WITH_SSL "builtin")
141-
endif()
142-
143-
144125
option(BUILD_STATIC "Link statically with the connector library" OFF)
145126

146127
if(BUILD_STATIC)
@@ -333,15 +314,12 @@ if(NOT WIN32)
333314
endif()
334315

335316
#
336-
# If connector uses OpenSSL libraries, we need to
337-
# link to them too.
317+
# We need to link to OpenSSL libraries too.
338318
#
339319

340-
if(NOT WITH_SSL STREQUAL "builtin")
341-
set_property(TARGET MySQL::conncpp-jdbc
342-
APPEND PROPERTY INTERFACE_LINK_LIBRARIES ssl crypto
343-
)
344-
endif()
320+
set_property(TARGET MySQL::conncpp-jdbc
321+
APPEND PROPERTY INTERFACE_LINK_LIBRARIES ssl crypto
322+
)
345323

346324
endif()
347325

0 commit comments

Comments
 (0)