File tree Expand file tree Collapse file tree 1 file changed +11
-5
lines changed Expand file tree Collapse file tree 1 file changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -112,12 +112,18 @@ ELSE (WIN32)
112
112
_MYSQL_CONFIG(MYSQL_LIB_DIR "(^| )-L" "--libs_r")
113
113
114
114
# In MySQL Server 5.6.10 "mysql_config" outputs -lssl
115
- # -lcrypto dependencies. We want to be able to statically
116
- # link with OpenSSL, so we honor a -DEXTRA_MYSQL_DEP=...
117
- # argument on the command line, and assume that you want
118
- # to add SSL libraries to link against yourself
119
- IF (EXTRA_MYSQL_DEP)
115
+ # -lcrypto dependencies even if (as it is with the
116
+ # Oracle built binaries) OpenSSL is linked statically
117
+ # to the client library and no reference is needed.
118
+ # We remove the OpenSSL libraries if -DREMOVE_OPENSSL_DEP
119
+ # is given
120
+ IF (REMOVE_OPENSSL_DEP)
120
121
LIST(REMOVE_ITEM MYSQL_LIBRARIES "ssl" "crypto")
122
+ ENDIF (REMOVE_OPENSSL_DEP)
123
+
124
+ # Optionally add more libraries from the command line
125
+ # using -DEXTRA_MYSQL_DEP=...
126
+ IF (EXTRA_MYSQL_DEP)
121
127
LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
122
128
ENDIF (EXTRA_MYSQL_DEP)
123
129
You can’t perform that action at this time.
0 commit comments