From b4a3fe370954015e00271827fdfbc28aac1065a4 Mon Sep 17 00:00:00 2001 From: antao Date: Sat, 16 Dec 2023 18:33:14 +0800 Subject: [PATCH] Fix trantor on win --- CMakeLists.txt | 4 ++-- cmake/templates/DrogonConfig.cmake.in | 2 +- trantor | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e92bf1ab..6b6d9a9c32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,10 +452,10 @@ if (BUILD_SQLITE) endif (BUILD_SQLITE) if (BUILD_REDIS) - find_package(Hiredis) + find_package(Hiredis NAMES hiredis CONFIG REQUIRED) if (Hiredis_FOUND) add_definitions(-DUSE_REDIS) - target_link_libraries(${PROJECT_NAME} PRIVATE Hiredis_lib) + target_link_libraries(${PROJECT_NAME} PRIVATE hiredis::hiredis) set(DROGON_SOURCES ${DROGON_SOURCES} nosql_lib/redis/src/RedisClientImpl.cc diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in index c1696349cd..b4da2bd8bc 100644 --- a/cmake/templates/DrogonConfig.cmake.in +++ b/cmake/templates/DrogonConfig.cmake.in @@ -34,7 +34,7 @@ if(@COZ-PROFILER_FOUND@) find_dependency(coz-profiler) endif() if(@Hiredis_FOUND@) -find_dependency(Hiredis) +find_dependency(hiredis CONFIG) endif() if(@yaml-cpp_FOUND@) find_dependency(yaml-cpp) diff --git a/trantor b/trantor index 5e4a81f275..57b57f5a82 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit 5e4a81f2758e65a475e02b8d6e530b9bfd445310 +Subproject commit 57b57f5a82fb970450c588f5c03a425fee8d947a