Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PS-9641 (8.0) Fix system ssl error #5537

Open
wants to merge 1 commit into
base: 8.0
Choose a base branch
from
+6 −2
Open

PS-9641 (8.0) Fix system ssl error #5537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cmake/ssl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,9 @@ MACRO (MYSQL_CHECK_SSL)
# WITH_SSL values (system, openssl11, /path/to/openssl). This will fix
# building modules which rely on OpenSSL::SSL and OpenSSL::Crypto only with
# different openssl variants.
ADD_LIBRARY(OpenSSL::SSL UNKNOWN IMPORTED)
IF(NOT TARGET OpenSSL::SSL)
ADD_LIBRARY(OpenSSL::SSL UNKNOWN IMPORTED)
ENDIF()
SET_TARGET_PROPERTIES(OpenSSL::SSL PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
IF(EXISTS "${MY_OPENSSL_LIBRARY}")
Expand All @@ -443,7 +445,9 @@ MACRO (MYSQL_CHECK_SSL)
IMPORTED_LOCATION "${MY_OPENSSL_LIBRARY}")
ENDIF()

ADD_LIBRARY(OpenSSL::Crypto UNKNOWN IMPORTED)
IF(NOT TARGET OpenSSL::Crypto)
ADD_LIBRARY(OpenSSL::Crypto UNKNOWN IMPORTED)
ENDIF()
SET_TARGET_PROPERTIES(OpenSSL::Crypto PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
IF(EXISTS "${MY_CRYPTO_LIBRARY}")
Expand Down