mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 06:47:55 +08:00
cb7d3b4999
* [libuv] Update to 1.45.0 * [libuv] Update all consuming ports * [libuv] Update versions * resolve port SHA * Add port-version * update version * revert usockets.json --------- Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e85a158..e67681c 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -30,8 +30,8 @@ if(REDIS_PLUS_PLUS_BUILD_ASYNC)
|
|
message(STATUS "redis-plus-plus build async interface with libuv")
|
|
|
|
# libuv dependency
|
|
- find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h)
|
|
- find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv)
|
|
+ find_package(libuv CONFIG REQUIRED)
|
|
+ set(REDIS_PLUS_PLUS_ASYNC_LIB $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv>)
|
|
else()
|
|
message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC")
|
|
endif()
|
|
@@ -150,7 +150,6 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC)
|
|
|
|
if(REDIS_PLUS_PLUS_BUILD_ASYNC)
|
|
target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${REDIS_PLUS_PLUS_ASYNC_FUTURE_HEADER}>)
|
|
- target_include_directories(${STATIC_LIB} PUBLIC $<BUILD_INTERFACE:${REDIS_PLUS_PLUS_ASYNC_LIB_HEADER}>)
|
|
if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost")
|
|
target_include_directories(${STATIC_LIB} SYSTEM PUBLIC $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>)
|
|
endif()
|