diff --git a/cmake/modules/CanaryLib.cmake b/cmake/modules/CanaryLib.cmake index fbb7aad27c0..cf16cbf2541 100644 --- a/cmake/modules/CanaryLib.cmake +++ b/cmake/modules/CanaryLib.cmake @@ -84,7 +84,6 @@ target_link_libraries(${PROJECT_NAME}_lib spdlog::spdlog unofficial::argon2::libargon2 unofficial::libmariadb - unofficial::mariadbclient protobuf ) diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake index e96b1e27d53..9e3b4587301 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake @@ -58,7 +58,7 @@ IF (WIN32) ADD_DEFINITIONS(-DDBUG_OFF) ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug) - FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient libmariadb + FIND_LIBRARY(MYSQL_LIB NAMES mariadbclient libmariadb PATHS $ENV{MYSQL_DIR}/lib/${libsuffixDist} $ENV{MYSQL_DIR}/libmysql diff --git a/vcpkg.json b/vcpkg.json index 9c55f5bddc7..1549bf6a851 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,6 +9,7 @@ "bext-ut", "curl", "eventpp", + "libmariadb", "luajit", "magic-enum", "mio", @@ -23,12 +24,6 @@ "default-features": true, "features": ["otlp-http", "prometheus"] }, - { - "name": "libmariadb", - "features": [ - "mariadbclient" - ] - }, { "name": "gmp", "platform": "linux" @@ -38,5 +33,5 @@ "platform": "windows" } ], - "builtin-baseline": "d07689ef165f033de5c0710e4f67c193a85373e1" + "builtin-baseline": "9558037875497b9db8cf38fcd7db68ec661bffe7" }