Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions ports/hiredis/CONTROL

This file was deleted.

13 changes: 13 additions & 0 deletions ports/hiredis/fix-include-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7eafeb8..623c586 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ IF(WIN32 OR MINGW)
TARGET_LINK_LIBRARIES(hiredis PRIVATE ws2_32)
ENDIF()

-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:.> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)

CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY)

1 change: 1 addition & 0 deletions ports/hiredis/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_from_github(
fix-feature-example.patch
support-static-in-win.patch
fix-timeval.patch
fix-include-path.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
23 changes: 23 additions & 0 deletions ports/hiredis/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "hiredis",
"version": "1.0.0",
"port-version": 1,
"description": "Hiredis is a minimalistic C client library for the Redis database.",
"homepage": "https://github.com/redis/hiredis",
"features": {
"example": {
"description": "Build example",
"dependencies": [
"libevent",
"libuv",
"pthread"
]
},
"ssl": {
"description": "Build hiredis_ssl for SSL support",
"dependencies": [
"openssl"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2418,7 +2418,7 @@
},
"hiredis": {
"baseline": "1.0.0",
"port-version": 0
"port-version": 1
},
"hpx": {
"baseline": "1.6.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/h-/hiredis.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ce136eecabedaebd15eb4a454c2ecf89f90e9c3",
"version": "1.0.0",
"port-version": 1
},
{
"git-tree": "e9c2ffbff25b0e22f0b09ec594b3f4288f685762",
"version-string": "1.0.0",
Expand Down