up

beats-dh · Oct 13, 2024 · d9038da · d9038da
1 parent e463aaf
commit d9038da
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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"
 }