From af6c9989d2e3124fcd3c5612faa3e233ae34f39d Mon Sep 17 00:00:00 2001
From: atkawa7 <atkawa7@yahoo.com>
Date: Thu, 8 Jun 2017 11:42:25 -0700
Subject: Created cpp-redis portfile  #982

---
 ports/cpp-redis/portfile.cmake | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 ports/cpp-redis/portfile.cmake

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
new file mode 100644
index 000000000..42b2697e7
--- /dev/null
+++ b/ports/cpp-redis/portfile.cmake
@@ -0,0 +1,53 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Cylix/cpp_redis
+    REF 3.5.1
+    SHA512  2c50cf777d5955f7bcb94a55514fac444d0dcacc2df343dd89969889be7653a793620dbaac9d6dd0f444eee7f0664c4eb96a1d83477d207143660764afeea129
+    HEAD_REF master
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS -DUSE_CUSTOM_TCP_CLIENT=TRUE
+)
+
+vcpkg_build_cmake()
+
+file(GLOB DLLS
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
+)
+file(GLOB LIBS
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
+)
+file(GLOB DEBUG_DLLS
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
+)
+file(GLOB DEBUG_LIBS
+"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
+    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
+)
+file(GLOB HEADERS "${SOURCE_PATH}/includes/cpp_redis/*.hpp" "${SOURCE_PATH}/includes/cpp_redis/*.hpp")
+if(DLLS)
+    file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+endif()
+file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+if(DEBUG_DLLS)
+    file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cpp_redis)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
+
+vcpkg_copy_pdbs()
-- 
cgit v1.2.3


From a9b3cb7fe9d369e471ca1d811a14df0b88cf5385 Mon Sep 17 00:00:00 2001
From: atkawa7 <atkawa7@yahoo.com>
Date: Thu, 8 Jun 2017 11:43:12 -0700
Subject: Created Control file

---
 ports/cpp-redis/CONTROL | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 ports/cpp-redis/CONTROL

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
new file mode 100644
index 000000000..30491dca4
--- /dev/null
+++ b/ports/cpp-redis/CONTROL
@@ -0,0 +1,3 @@
+Source: cpp-redis
+Version: 3.5.1
+Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
-- 
cgit v1.2.3


From bd2665ced95a1c869837e65db0e01552bc5886a2 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 1 Aug 2017 14:55:47 -0700
Subject: [cpp-redis] Add missing headers, manipulate them to match build type
 (CUSTOM_TCP_CLIENT=true)

---
 ports/cpp-redis/CONTROL        |  2 +-
 ports/cpp-redis/portfile.cmake | 57 ++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 33 deletions(-)

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 30491dca4..978eb678d 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,3 +1,3 @@
 Source: cpp-redis
-Version: 3.5.1
+Version: 3.5.1-1
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index 42b2697e7..9c5378f9f 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -1,5 +1,9 @@
 include(vcpkg_common_functions)
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "cpp-redis only supports static library linkage.")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
@@ -8,45 +12,34 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
+if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
+else()
+    set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
+endif()
+
+# cpp-redis forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected.
+list(APPEND VCPKG_CXX_FLAGS_DEBUG "-RTC1")
+list(APPEND VCPKG_C_FLAGS_DEBUG "-RTC1")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DUSE_CUSTOM_TCP_CLIENT=TRUE
+    OPTIONS
+        -DUSE_CUSTOM_TCP_CLIENT=TRUE
+        -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
 )
 
-vcpkg_build_cmake()
+vcpkg_install_cmake()
 
-file(GLOB DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll"
-)
-file(GLOB LIBS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/lib/*.lib"
-)
-file(GLOB DEBUG_DLLS
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll"
-)
-file(GLOB DEBUG_LIBS
-"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/*.lib"
-    "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/lib/*.lib"
-)
-file(GLOB HEADERS "${SOURCE_PATH}/includes/cpp_redis/*.hpp" "${SOURCE_PATH}/includes/cpp_redis/*.hpp")
-if(DLLS)
-    file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-if(DEBUG_DLLS)
-    file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/cpp_redis)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
+foreach(file ${FILES})
+    file(READ ${file} _contents)
+    string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 0" _contents "${_contents}")
+    file(WRITE ${file} "${_contents}")
+endforeach()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
 
-- 
cgit v1.2.3


From cc822ead1cce550a0f0f77f39a14c02b43244276 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 1 Aug 2017 15:23:45 -0700
Subject: [tacopie][cpp-redis] Update cpp-redis to depend on tacopie. Fix
 tacopie port.

---
 ports/cpp-redis/CONTROL        |  1 +
 ports/cpp-redis/portfile.cmake | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 978eb678d..7010a0d00 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,3 +1,4 @@
 Source: cpp-redis
 Version: 3.5.1-1
+Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index 9c5378f9f..3a560a047 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -7,11 +7,13 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
-    REF 3.5.1
-    SHA512  2c50cf777d5955f7bcb94a55514fac444d0dcacc2df343dd89969889be7653a793620dbaac9d6dd0f444eee7f0664c4eb96a1d83477d207143660764afeea129
+    REF 3.5.2
+    SHA512  d19445c93fad9fba39c7aed07b2d196ec0c96366324a2a2ee856c930683b5428fe8b5bc46de4b2b23112aae83f8229a4703c2355d1c74831602ec3a7f8dac315
     HEAD_REF master
 )
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
+
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
     set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
 else()
@@ -19,14 +21,13 @@ else()
 endif()
 
 # cpp-redis forcibly removes "/RTC1" in its cmake file. Because this is an ABI-sensitive flag, we need to re-add it in a form that won't be detected.
-list(APPEND VCPKG_CXX_FLAGS_DEBUG "-RTC1")
-list(APPEND VCPKG_C_FLAGS_DEBUG "-RTC1")
+set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_CXX_FLAGS_DEBUG} -RTC1")
+set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DUSE_CUSTOM_TCP_CLIENT=TRUE
         -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
 )
 
@@ -37,7 +38,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi
 file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
 foreach(file ${FILES})
     file(READ ${file} _contents)
-    string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 0" _contents "${_contents}")
+    string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}")
     file(WRITE ${file} "${_contents}")
 endforeach()
 
-- 
cgit v1.2.3


From 5e9ac8a25bee0eb074f139bc73ed8e2a3755fc2d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 1 Aug 2017 15:26:30 -0700
Subject: [cpp-redis] Bump version

---
 ports/cpp-redis/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 7010a0d00..1d6a15b59 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 3.5.1-1
+Version: 3.5.2
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
-- 
cgit v1.2.3


From 68fabb939e09c55fe4fe0458157df426a6e1d5d8 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 8 Aug 2017 15:51:42 -0700
Subject: [cpp-redis] Commit missing tacopie/CMakeLists.txt

Fixes #1610
---
 ports/cpp-redis/CONTROL                | 2 +-
 ports/cpp-redis/tacopie/CMakeLists.txt | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 ports/cpp-redis/tacopie/CMakeLists.txt

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 1d6a15b59..36b2e8b55 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 3.5.2
+Version: 3.5.2-1
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/tacopie/CMakeLists.txt b/ports/cpp-redis/tacopie/CMakeLists.txt
new file mode 100644
index 000000000..74959e2e1
--- /dev/null
+++ b/ports/cpp-redis/tacopie/CMakeLists.txt
@@ -0,0 +1,8 @@
+find_library(TACOPIE tacopie)
+find_path(TACOPIE_H tacopie/tacopie)
+
+message(STATUS "TACOPIE_H: ${TACOPIE_H}")
+
+add_library(tacopie INTERFACE)
+target_link_libraries(tacopie INTERFACE "${TACOPIE}")
+target_include_directories(tacopie INTERFACE "${TACOPIE_H}")
\ No newline at end of file
-- 
cgit v1.2.3


From 26516fe485b0e9048dd4809256a7e4526957c6e9 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Sat, 9 Sep 2017 00:12:54 -0700
Subject: vcpkg_configure_cmake (and _meson) now embed debug symbols within
 static libs (/Z7)

---
 ports/cpp-redis/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 36b2e8b55..554755b57 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 3.5.2-1
+Version: 3.5.2-2
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
-- 
cgit v1.2.3


From 68f9f8943114677d6c66d85c14ccd1e5dcca8fd7 Mon Sep 17 00:00:00 2001
From: Andrei Lebedev <lebdron@gmail.com>
Date: Wed, 3 Jan 2018 02:03:43 +0300
Subject: [cpp-redis] Update to 4.3.0

---
 ports/cpp-redis/CONTROL              |  2 +-
 ports/cpp-redis/fix-cmakelists.patch | 29 +++++++++++++++++++++++++++++
 ports/cpp-redis/fix-export.patch     | 22 ++++++++++++++++++++++
 ports/cpp-redis/portfile.cmake       | 26 +++++++++++++++++++-------
 4 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 ports/cpp-redis/fix-cmakelists.patch
 create mode 100644 ports/cpp-redis/fix-export.patch

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 554755b57..53ed862c2 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 3.5.2-2
+Version: 4.3.0
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/fix-cmakelists.patch b/ports/cpp-redis/fix-cmakelists.patch
new file mode 100644
index 000000000..2839ce56f
--- /dev/null
+++ b/ports/cpp-redis/fix-cmakelists.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae20868..01bb84c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,7 @@
+ cmake_minimum_required(VERSION 2.8.7)
+ set(CMAKE_MACOSX_RPATH 1)
+ include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
++include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake)
+ 
+ 
+ ###
+@@ -170,6 +171,8 @@ if(USE_CUSTOM_TCP_CLIENT)
+   set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}")
+ endif(USE_CUSTOM_TCP_CLIENT)
+ 
++generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp)
++target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR})
+ 
+ ###
+ # install
+@@ -181,6 +184,7 @@ install(DIRECTORY DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+ install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION lib USE_SOURCE_PERMISSIONS)
+ install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DESTINATION bin USE_SOURCE_PERMISSIONS)
+ install(DIRECTORY ${CPP_REDIS_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS)
++install (FILES ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp DESTINATION include/cpp_redis/misc)
+ 
+ 
+ ###
diff --git a/ports/cpp-redis/fix-export.patch b/ports/cpp-redis/fix-export.patch
new file mode 100644
index 000000000..1b071c511
--- /dev/null
+++ b/ports/cpp-redis/fix-export.patch
@@ -0,0 +1,22 @@
+diff --git a/includes/cpp_redis/misc/logger.hpp b/includes/cpp_redis/misc/logger.hpp
+index d79a98f..bfb33b9 100644
+--- a/includes/cpp_redis/misc/logger.hpp
++++ b/includes/cpp_redis/misc/logger.hpp
+@@ -26,6 +26,8 @@
+ #include <mutex>
+ #include <string>
+ 
++#include <cpp_redis/misc/cpp_redis_export.hpp>
++
+ namespace cpp_redis {
+ 
+ //!
+@@ -161,7 +163,7 @@ private:
+ //! variable containing the current logger
+ //! by default, not set (no logs)
+ //!
+-extern std::unique_ptr<logger_iface> active_logger;
++extern CPP_REDIS_EXPORT std::unique_ptr<logger_iface> active_logger;
+ 
+ //!
+ //! debug logging
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index 3a560a047..ea0ea1194 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -1,17 +1,20 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    message(STATUS "cpp-redis only supports static library linkage.")
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
-    REF 3.5.2
-    SHA512  d19445c93fad9fba39c7aed07b2d196ec0c96366324a2a2ee856c930683b5428fe8b5bc46de4b2b23112aae83f8229a4703c2355d1c74831602ec3a7f8dac315
+    REF 4.3.0
+    SHA512 d4a2865b72b4dfa80b6d3c004245014a77e74d4a3d254d6b0a9d50e890a22dc3d9ce54688a8c9185ecee9bbf8cdf76046a9788c70887ccf8a08d5cdcef298b46
     HEAD_REF master
 )
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-export.patch
+)
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
 
 if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
@@ -29,11 +32,12 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG}
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
 )
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
 foreach(file ${FILES})
@@ -42,6 +46,14 @@ foreach(file ${FILES})
     file(WRITE ${file} "${_contents}")
 endforeach()
 
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+file(COPY ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin)
+
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 vcpkg_copy_pdbs()
-- 
cgit v1.2.3


From e3dda1a82dccb1c74af615572d6c35df9707275f Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 22 Feb 2018 07:54:18 -0800
Subject: 
 [azure-storage-cpp][cpp-redis][dirent][doctest][gdcm2][grpc][llvm][matio][spdlog][yaml-cpp]
 Upgrades

---
 ports/cpp-redis/CONTROL              |  2 +-
 ports/cpp-redis/fix-cmakelists.patch | 29 -----------------------------
 ports/cpp-redis/fix-export.patch     | 22 ----------------------
 ports/cpp-redis/portfile.cmake       | 28 ++++++++++++++--------------
 4 files changed, 15 insertions(+), 66 deletions(-)
 delete mode 100644 ports/cpp-redis/fix-cmakelists.patch
 delete mode 100644 ports/cpp-redis/fix-export.patch

(limited to 'ports/cpp-redis')

diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL
index 53ed862c2..5f001f04d 100644
--- a/ports/cpp-redis/CONTROL
+++ b/ports/cpp-redis/CONTROL
@@ -1,4 +1,4 @@
 Source: cpp-redis
-Version: 4.3.0
+Version: 4.3.1
 Build-Depends: tacopie
 Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cpp-redis/fix-cmakelists.patch b/ports/cpp-redis/fix-cmakelists.patch
deleted file mode 100644
index 2839ce56f..000000000
--- a/ports/cpp-redis/fix-cmakelists.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae20868..01bb84c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,6 +26,7 @@
- cmake_minimum_required(VERSION 2.8.7)
- set(CMAKE_MACOSX_RPATH 1)
- include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
-+include(${CMAKE_ROOT}/Modules/GenerateExportHeader.cmake)
- 
- 
- ###
-@@ -170,6 +171,8 @@ if(USE_CUSTOM_TCP_CLIENT)
-   set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_USE_CUSTOM_TCP_CLIENT=${USE_CUSTOM_TCP_CLIENT}")
- endif(USE_CUSTOM_TCP_CLIENT)
- 
-+generate_export_header(${PROJECT} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp)
-+target_include_directories(${PROJECT} PUBLIC ${CMAKE_BINARY_DIR})
- 
- ###
- # install
-@@ -181,6 +184,7 @@ install(DIRECTORY DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
- install(DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} DESTINATION lib USE_SOURCE_PERMISSIONS)
- install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DESTINATION bin USE_SOURCE_PERMISSIONS)
- install(DIRECTORY ${CPP_REDIS_INCLUDES}/ DESTINATION include USE_SOURCE_PERMISSIONS)
-+install (FILES ${CMAKE_BINARY_DIR}/cpp_redis/misc/${PROJECT}_export.hpp DESTINATION include/cpp_redis/misc)
- 
- 
- ###
diff --git a/ports/cpp-redis/fix-export.patch b/ports/cpp-redis/fix-export.patch
deleted file mode 100644
index 1b071c511..000000000
--- a/ports/cpp-redis/fix-export.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/includes/cpp_redis/misc/logger.hpp b/includes/cpp_redis/misc/logger.hpp
-index d79a98f..bfb33b9 100644
---- a/includes/cpp_redis/misc/logger.hpp
-+++ b/includes/cpp_redis/misc/logger.hpp
-@@ -26,6 +26,8 @@
- #include <mutex>
- #include <string>
- 
-+#include <cpp_redis/misc/cpp_redis_export.hpp>
-+
- namespace cpp_redis {
- 
- //!
-@@ -161,7 +163,7 @@ private:
- //! variable containing the current logger
- //! by default, not set (no logs)
- //!
--extern std::unique_ptr<logger_iface> active_logger;
-+extern CPP_REDIS_EXPORT std::unique_ptr<logger_iface> active_logger;
- 
- //!
- //! debug logging
diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake
index ea0ea1194..9187e344f 100644
--- a/ports/cpp-redis/portfile.cmake
+++ b/ports/cpp-redis/portfile.cmake
@@ -3,21 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Cylix/cpp_redis
-    REF 4.3.0
-    SHA512 d4a2865b72b4dfa80b6d3c004245014a77e74d4a3d254d6b0a9d50e890a22dc3d9ce54688a8c9185ecee9bbf8cdf76046a9788c70887ccf8a08d5cdcef298b46
+    REF 4.3.1
+    SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-export.patch
-)
-
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie)
 
-if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
     set(MSVC_RUNTIME_LIBRARY_CONFIG "/MD")
 else()
     set(MSVC_RUNTIME_LIBRARY_CONFIG "/MT")
@@ -43,16 +36,23 @@ file(GLOB_RECURSE FILES "${CURRENT_PACKAGES_DIR}/include/*")
 foreach(file ${FILES})
     file(READ ${file} _contents)
     string(REPLACE "ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT" "if 1" _contents "${_contents}")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        string(REPLACE
+            "extern std::unique_ptr<logger_iface> active_logger;"
+            "extern __declspec(dllimport) std::unique_ptr<logger_iface> active_logger;"
+            _contents "${_contents}")
+    endif()
     file(WRITE ${file} "${_contents}")
 endforeach()
 
-file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
-file(COPY ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin DESTINATION ${CURRENT_PACKAGES_DIR})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/lib ${CURRENT_PACKAGES_DIR}/debug/bin/bin ${CURRENT_PACKAGES_DIR}/lib/lib ${CURRENT_PACKAGES_DIR}/bin/bin)
+file(GLOB FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/cpp_redis.ilk" "${CURRENT_PACKAGES_DIR}/bin/cpp_redis.dll.manifest")
+if(FILES_TO_REMOVE)
+    file(REMOVE_RECURSE ${FILES_TO_REMOVE})
+endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpp-redis RENAME copyright)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-- 
cgit v1.2.3