database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-28107 S3 doesn't build if CURL is in non-default location

Browse Source
This commit is contained in:
Sergei Golubchik
2022-03-23 13:06:13 +01:00
parent 2ca3861b55
commit d2c019b200
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/maria/CMakeLists.txt
View File

@@ -122,9 +122,9 @@ IF(NOT PLUGIN_S3 STREQUAL NO AND NOT WIN32)
ENDIF() ENDIF()
IF (CURL_FOUND) IF (CURL_FOUND)
LINK_DIRECTORIES(${PC_CURL_LIBDIR}) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
MYSQL_ADD_PLUGIN(s3 ha_s3.cc ${S3_SOURCES} COMPONENT s3-engine MYSQL_ADD_PLUGIN(s3 ha_s3.cc ${S3_SOURCES} COMPONENT s3-engine
LINK_LIBRARIES curl z STORAGE_ENGINE NOT_EMBEDDED CONFIG s3.cnf) LINK_LIBRARIES ${CURL_LIBRARIES} z STORAGE_ENGINE NOT_EMBEDDED CONFIG s3.cnf)
ENDIF() ENDIF()
SET(CPACK_RPM_s3-engine_PACKAGE_SUMMARY "Amazon S3 archival storage engine for MariaDB" PARENT_SCOPE) SET(CPACK_RPM_s3-engine_PACKAGE_SUMMARY "Amazon S3 archival storage engine for MariaDB" PARENT_SCOPE)