Skip to content

Commit abbd731

Browse files
Lorenzo ManganiLorenzo Mangani
authored andcommitted
resync
1 parent 54fddf2 commit abbd731

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ cmake_minimum_required(VERSION 3.5)
44
set(TARGET_NAME redis)
55

66
# DuckDB's extension distribution supports vcpkg
7-
find_package(Boost REQUIRED COMPONENTS system)
7+
find_package(Boost REQUIRED)
8+
find_package(boost-asio CONFIG REQUIRED)
89

910
set(EXTENSION_NAME ${TARGET_NAME}_extension)
1011
set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
@@ -18,13 +19,8 @@ build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
1819
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
1920

2021
# Link against Boost
21-
if(TARGET Boost::system)
22-
target_link_libraries(${EXTENSION_NAME} PRIVATE Boost::system)
23-
target_link_libraries(${LOADABLE_EXTENSION_NAME} PRIVATE Boost::system)
24-
else()
25-
target_link_libraries(${EXTENSION_NAME} PRIVATE ${Boost_LIBRARIES})
26-
target_link_libraries(${LOADABLE_EXTENSION_NAME} PRIVATE ${Boost_LIBRARIES})
27-
endif()
22+
target_link_libraries(${EXTENSION_NAME} PRIVATE Boost::boost boost::asio)
23+
target_link_libraries(${LOADABLE_EXTENSION_NAME} PRIVATE Boost::boost boost::asio)
2824

2925
# Define REDISCPP_HEADER_ONLY to use redis-cpp as header-only
3026
target_compile_definitions(${EXTENSION_NAME} PRIVATE REDISCPP_HEADER_ONLY)

vcpkg.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"version": "0.1.0",
44
"dependencies": [
55
{
6-
"name": "boost",
7-
"default-features": false,
8-
"features": ["system"]
6+
"name": "boost-asio"
97
}
108
]
119
}

0 commit comments

Comments
 (0)