* [hiredis] Fix include path

* Update versions

* Update ports/hiredis/vcpkg.json

* Update versions/h-/hiredis.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
This commit is contained in:
NancyLi1013 2021-03-11 04:01:27 +08:00 коммит произвёл GitHub
Родитель c3c77073f8
Коммит d3c432d955
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 43 добавлений и 14 удалений

Просмотреть файл

@ -1,13 +0,0 @@
Source: hiredis
Version: 1.0.0
Port-Version: 0
Homepage: https://github.com/redis/hiredis
Description: Hiredis is a minimalistic C client library for the Redis database.
Feature: ssl
Description: Build hiredis_ssl for SSL support
Build-Depends: openssl
Feature: example
Description: Build example
Build-Depends: libevent, pthread, libuv

Просмотреть файл

@ -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)

Просмотреть файл

@ -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

23
ports/hiredis/vcpkg.json Normal file
Просмотреть файл

@ -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"
]
}
}
}

Просмотреть файл

@ -2418,7 +2418,7 @@
},
"hiredis": {
"baseline": "1.0.0",
"port-version": 0
"port-version": 1
},
"hpx": {
"baseline": "1.6.0",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ce136eecabedaebd15eb4a454c2ecf89f90e9c3",
"version": "1.0.0",
"port-version": 1
},
{
"git-tree": "e9c2ffbff25b0e22f0b09ec594b3f4288f685762",
"version-string": "1.0.0",