@@ -54,16 +54,9 @@ endif()
54
54
# BUILD_STATIC whether to link with connector statically
55
55
# or dynamically (the default)
56
56
#
57
- # WITH_SSL tells if connector uses built-in SSL implementation
58
- # or relies on external OpenSSL libraries (*)
59
- #
60
57
# WITH_BOOST where to look for Boost if can not be found
61
58
# at standard locations.
62
59
#
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
- #
67
60
# Note: Either WITH_CONCPP or CONCPP_INCLUDE_DIR and CONCPP_LIB_DIR must be
68
61
# set.
69
62
#
@@ -129,18 +122,6 @@ if(NOT CONCPP_INCLUDE_DIR OR NOT CONCPP_LIB_DIR)
129
122
endif ()
130
123
131
124
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
-
144
125
option (BUILD_STATIC "Link statically with the connector library" OFF )
145
126
146
127
if (BUILD_STATIC )
@@ -333,15 +314,12 @@ if(NOT WIN32)
333
314
endif ()
334
315
335
316
#
336
- # If connector uses OpenSSL libraries, we need to
337
- # link to them too.
317
+ # We need to link to OpenSSL libraries too.
338
318
#
339
319
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
+ )
345
323
346
324
endif ()
347
325
0 commit comments