aboutsummaryrefslogtreecommitdiff
path: root/ports/redis-plus-plus
diff options
context:
space:
mode:
Diffstat (limited to 'ports/redis-plus-plus')
-rw-r--r--ports/redis-plus-plus/CONTROL2
-rw-r--r--ports/redis-plus-plus/disable-build-test.patch13
-rw-r--r--ports/redis-plus-plus/portfile.cmake10
3 files changed, 7 insertions, 18 deletions
diff --git a/ports/redis-plus-plus/CONTROL b/ports/redis-plus-plus/CONTROL
index 7e5d3e196..77a355f40 100644
--- a/ports/redis-plus-plus/CONTROL
+++ b/ports/redis-plus-plus/CONTROL
@@ -1,5 +1,5 @@
Source: redis-plus-plus
-Version: 1.1.1
+Version: 1.1.2
Homepage: https://github.com/sewenew/redis-plus-plus
Description: This is a C++ client for Redis. It's based on hiredis, and written in C++ 11.
Build-Depends: hiredis \ No newline at end of file
diff --git a/ports/redis-plus-plus/disable-build-test.patch b/ports/redis-plus-plus/disable-build-test.patch
deleted file mode 100644
index a180250e1..000000000
--- a/ports/redis-plus-plus/disable-build-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fb160b5..6235d89 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,7 +34,7 @@ set_target_properties(${SHARED_LIB} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
- set_target_properties(${STATIC_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- set_target_properties(${SHARED_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-
--add_subdirectory(test)
-+#add_subdirectory(test)
-
- # Install static lib.
- install(TARGETS ${STATIC_LIB}
diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake
index 8eba51a38..5878671e4 100644
--- a/ports/redis-plus-plus/portfile.cmake
+++ b/ports/redis-plus-plus/portfile.cmake
@@ -1,17 +1,19 @@
+#Blocked by ninja: error: build.ninja:348: multiple rules generate lib/redis++.lib [-w dupbuild=err]
vcpkg_fail_port_install(ON_TARGET "Windows")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sewenew/redis-plus-plus
- REF d35267580568517f09bdf70cb582e5284c25401a
- SHA512 f065b97d438772300e30485a7550bc0fff00005f1056cf9c23216ea388fa088303869ccf2eaa70ee8b06cc0fc2406c9c6faddd5ad08759ee2d0665ac91761914
+ REF b08b36a9a91de00636e583307610f49af7876f50 # 1.1.2
+ SHA512 6dcead9fca9e7082ace28dcd72a1b325e229297080eea3e5a28ef5e6b9e4a7d1bcb3568997a5e7a031d7937a025a017ed92d7869db5829ba6113783c84bc5a68
HEAD_REF master
- PATCHES disable-build-test.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJIA
+ PREFER_NINJA
+ OPTIONS
+ -DREDIS_PLUS_PLUS_BUILD_TEST=OFF
)
vcpkg_install_cmake()