34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
--- mysql-8.0.34/extra/curl/CMakeLists.txt_orig 2023-06-22 17:07:42.000000000 +0600
|
|
+++ mysql-8.0.34/extra/curl/CMakeLists.txt 2023-08-16 18:35:45.745756242 +0600
|
|
@@ -20,8 +20,13 @@
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
+# OpenSSL
|
|
+add_library(OpenSSL::SSL STATIC IMPORTED)
|
|
+add_library(OpenSSL::Crypto STATIC IMPORTED)
|
|
+set_target_properties(OpenSSL::SSL PROPERTIES IMPORTED_LOCATION ${OPENSSL_SSL_LIBRARY})
|
|
+set_target_properties(OpenSSL::Crypto PROPERTIES IMPORTED_LOCATION ${OPENSSL_CRYPTO_LIBRARY})
|
|
|
|
-INCLUDE_DIRECTORIES(BEFORE SYSTEM ${ZSTD_INCLUDE_DIR})
|
|
+INCLUDE_DIRECTORIES(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR})
|
|
LINK_DIRECTORIES(BEFORE ${OPENSSL_LIB_DIR})
|
|
|
|
SET(BUILD_CURL_EXE OFF)
|
|
--- mysql-8.0.34/cmake/curl.cmake_orig 2023-06-22 17:07:42.000000000 +0600
|
|
+++ mysql-8.0.34/cmake/curl.cmake 2023-08-16 14:19:07.799312004 +0600
|
|
@@ -233,12 +233,7 @@
|
|
IF(WITH_CURL STREQUAL "system")
|
|
FIND_SYSTEM_CURL(CURL_INCLUDE_DIR)
|
|
ELSEIF(WITH_CURL STREQUAL "bundled")
|
|
- IF(ALTERNATIVE_SYSTEM_SSL)
|
|
- MYSQL_USE_BUNDLED_CURL(CURL_INCLUDE_DIR)
|
|
- ELSE()
|
|
- MESSAGE(WARNING "WITH_CURL options: ${WITH_CURL_DOC}")
|
|
- MESSAGE(FATAL_ERROR "Bundled CURL library is not supported.")
|
|
- ENDIF()
|
|
+ MYSQL_USE_BUNDLED_CURL(CURL_INCLUDE_DIR)
|
|
ELSEIF(WITH_CURL)
|
|
FIND_CUSTOM_CURL(CURL_INCLUDE_DIR)
|
|
ENDIF()
|
